Merge from trunk - HIVE-7869 - Build long running HS2 test framework (Suhas Satish via Brock)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1622053 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'upstream/spark' into spark