HBASE-7910 Dont use reflection for security (Mike Drob)
Amend HBASE-7910 Dont use reflection for security; Fix patch misapplication
Merge remote-tracking branch 'remotes/origin/0.96' into 0.96