SHARK-172: Hive 0.11: Make ppd2 unit test pass
HIVE-4853 : junit timeout needs to be updated (Gunther Hagleitner via Ashutosh Chauhan)

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