Merge branch 'jk/http-auth-tests-robustify'