Applied some patches in modulemapper, notification, platform etc to make it work on 3.x