Revert "x"

This reverts commit c475c89d97fb1690f48faabde1b84483f100da1d.
Revert "Dynamic lookup of $tomcat_home is deprecated."

This reverts commit f67bf62eb34d472ac330fe702f0f013d62ab1de4.