HIVE-4904 A little more CP crossing RS boundaries (Navis Ryu via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/branch-0.13@1586050 13f79535-47bb-0310-9956-ffa450edef68