Merge with trunk
CHF-9 CR-8325 Use new Headers API correctly
OPENAM-6895 CR-8247 Integrate latest changes to CHF and CAUD
Updates for CHF-6 Context changes
AME-8175/AME-8303 CR-8138 Moving Core and SMS Rest route registration to openam-core-rest