HBASE-8910  HMaster.abortNow shouldn't try to become a master again if it was stopped


git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1501869 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/0.94' into 0.94-gd
HBASE-8826 Ensure HBASE-8695 is covered in Thrift 2

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1501970 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8921 [thrift2] Add GenericOptionsParser to Thrift 2 server

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1501984 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/0.94' into 0.94-gd
Merge remote branch 'origin/0.94-gd' into fb-YAHOO-312-0.94-gd