OPENAM-6895 CR-8247 Integrate latest changes to CHF and CAUD
AME-8175/AME-8303 CR-8135 Moving OAuth2 and UMA Rest route registration to openam-oauth2 and openam-uma