Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint