HIVE-4052 : Disallow partition/sort and distribute/order combinations in windowing and partitioning spec (Harish Butani via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/ptf-windowing@1450040 13f79535-47bb-0310-9956-ffa450edef68
Resolve Merge conflicts with ptf-windowing + Renumber last 3 test cases