Merge "services/mgmt/application/impl/* convert application to hierarchicalAuth"