Oops, fix CATALINA_OPTS duplicates