Fix build (cws)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1520837 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd