Upgrading to mule 3.5-M4 and munit 3.5-M2