Revert "group input parameters that depend to each other"

This reverts commit 65db9d4d6e1782a73f2c8d98d0258e0e8518d0c4.

	modified:   manifests/instance.pp
	modified:   templates/tomcat_env.erb