Fixed/refactored some of the management support for messaging, specifically dependency injection in place of static accessors and incorrect bean id fix