Merge branch 'backport-ci-no-kwsys-console-buf' into ci-no-kwsys-console-buf

The test no longer exists in post-4.0 development, so use `-s ours`
to avoid adding the exclusion.