HBASE-8695 The HBase thrift service ignores XML configuration

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1502161 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7770 minor integration test framework fixes (Francis Liu)

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1502417 13f79535-47bb-0310-9956-ffa450edef68