HIVE-4892 PTest2 cleanup after merge (Brock Noland via egc)

Submitted by: Brock Noland	
Reviewed by: Edward Capriolo	


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