HD-382 Hiveserver 0.13.1 fails to start in kerberized environment

Applying patch from Hive community jira (HIVE-6741)

https://issues.apache.org/jira/browse/HIVE-6741