HIVE-5086 : Fix scriptfile1.q on Windows (Daniel Dai via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1524830 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5322: FsPermission is initialized incorrectly in HIVE 5513 (Mark Wagner via Thejas Nair)

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