When `MHE` was moved to spring-messaging, 2 constructors were dropped. INT-3246 worked around it but it had undesirable side-effects. Constructors have been added back in spring-messaging so this commit reverts to using those constructors. JIRA: https://jira.springsource.org/browse/INT-3271