fixes for MULE-6843
MULE-6613: removing nice but unnecessary assertion that causes race condition when running in bamboo
Merge branch 'mule-3.x' of github.com:mulesoft/mule into mule-3.x