CM - 5.2 to 6

Changes for Customized Messaging - Part 5 and 6 (Web API Injection and
Overriding Configuration)