Added parameter for determining tomcat version
Updated jenkins.pp for more clear ordering and notifications.
updated jenkins.pp
corrected merge
Merge branch 'testing'

Conflicts:
	manifests/jenkins.pp