Update mq-default profile
Add workaround for ENTESB-2239
Revert "Add workaround for ENTESB-2239"

This reverts commit 0e944dc93275d0d4b6126d493b76cae6939b751d.