HIVE-7386 - PTest support non-spot instances and higher cpu masters (Szehon via Brock)

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