undo effects of refactoring
Fixed external AD keytab generation
Fix configuration for external AD
Enforce kerberos configuration in external AD mode