HBASE-10614 Master could not be stopped (Jingcheng Du)

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