HBASE-10331. Insure security tests use SecureTestUtil methods for grants

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1557856 13f79535-47bb-0310-9956-ffa450edef68
HBASE-10315 Canary shouldn't exit with 3 if there is no master running.

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