Rebasing standalone-metastore branch post HIVE-17981

[Alan Gates]

I have committed HIVE-17981 to master and will be rebasing the
standalone-metastore up to the current master branch.

Alan.