Merge branch 'kc/maint-diff-bwi-fix' into maint

* kc/maint-diff-bwi-fix: Fix combined use of whitespace ignore options to diff test more combinations of ignore-whitespace options to diff