MAMA: Additional enum replacement cleanup.

Fixing a number of issues with enum replacement, including improving
looping, and fixing the loading of default payloads.
UNITTEST: Removal of QPID Middleware references for testing.