GERONIMO-6729 fixing model after API upgrade
42 files changed