Merge commit 'origin/master' into rxk5-devel-branch
Conflicts:
ChangeLog
merge:
* src/password.c: force at least one attempt to authenticate using
the KDC, even in the pathological case where there's no previously-
entered password and we were told not to ask for one (#400611)