GPII 940 - Support the new MM payload in the RBMM 

This pull adresses the following JIRAs: 

* http://issues.gpii.net/browse/GPII-940 to support the new MM payloads 
* http://issues.gpii.net/browse/GPII-786 and to support conditional preferences