OZP-753: Fix CATALINA_OPTS in setenv, also added equinox jar to system folder, still using felix however : updating parent commits