Specifying the Kerberos master password is not needed, it will get autogenerated.
Merge branch 'master' into rhel-6