Need to change the structure of generated bundle to be the same as ESB. ...

...MULE-7059