Rebasing standalone-metastore branch

[Alan Gates]

I'm about to check in HIVE-17967.  Once I do that, I will rebase the
standalone-metastore branch onto master post that commit and then force
push it.  This way the branch will be up to date with master again.

Alan.