HIVE-4951 : combine2_win.q.out needs update for HIVE3253 (increasing nesting levels) (Thejas Nair via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1510039 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4915 : unit tests fail on windows because of difference in input file size (Thejas Nair via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1510040 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