Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev