KNOX-442 Align Tests with Hive API Change
Merge remote-tracking branch 'origin/apache-ref/master' into champlain