GERONIMO-4652 upgrade to genesis 2