Merge pull request #2129 from commodo/krb5-upgrade-n-fix