INT-3309 Resolve TODOs

Provide access to the MessageBuilderFactory in all classes.