added SSL and Kerberos to configuration
resolve ssl branch merge conflict