HIVE-5531: Hiverserver2 doesn't honor command line argument when initializing log4j (Shuaishuai Nie via Thejas Nair)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1532632 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5546 : A change in ORCInputFormat made by HIVE4113 was reverted by HIVE5391 (Yin Huai via Ashutosh Chauhan)

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