Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439 Use CATALINA_OPTS only on start, resolves: rhbz#1051194