Merge branch 'moonshot-negotiate' of file:///srv/git/mod_auth_kerb