HIVE-4020: Swap applying order of CP and PPD (Navis via Ashutosh Chauhan)

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