allow for multiple instances#577

Enrice wants to merge 3 commits intopuppetlabs:mainpuppetlabs/puppetlabs-tomcat:mainfrom

Enrice:mainEnrice/puppetlabs-tomcat:mainCopy head branch name to clipboard