Merge pull request #490 from fabianofranz/master

Merged by openshift-bot
krb5 work
Allow passing key type and content via command line
Merge pull request #481 from liggitt/krb5

Merged by openshift-bot
Add feature test for kerberos key add
Automatic commit of package [rhc] release [1.16.3-1].
Merge pull request #491 from liggitt/krb5

Merged by openshift-bot
Automatic commit of package [rhc] release [1.16.4-1].