Changes to support flexmojos 4.0-RC2