OGM-301 Fix maven modules build order