HIVE-5085 : Hive Metatool errors out if HIVE_OPTS is set (Sushanth Sowmyan via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1515200 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5116 : HIVE-2608 didn't removed udtf_not_supported2.q test (Navis via Ashutosh Chauhan)

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