HCATALOG-509: Webhcat security work - HCATALOG-509_2.patch