Amend HBASE-7910 Dont use reflection for security; Fix patch misapplication