HIVE-5010: HCatalog maven integration doesn't override mvn.local.repo in two locations

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