HIVE-5610 - Merge maven branch into trunk (patch)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1537576 13f79535-47bb-0310-9956-ffa450edef68