SWITCHYARD-1672 - Fixes for messagecomposer/contextmapper removal