Revert "[COOK-3370] Don't install the tomcat manager apps package if we're not going to use it"

This reverts commit e55ad948d4e65b308ba9ca2afa097dcc9129d226.
[COOK-4301] Fix duplicate truststore params in java_options