fixing merge
Merge branch 'munit-3.5.x-merge' of https://github.com/mulesoft/munit into munit-3.5.x-merge