- using pillar instead of config.option
- using version option in tomcat manager instead of ##
- remove war file from minion after copying
use salt.util.option instead of pillar/config.option
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #4305 from ranl/develop

tomcat module fix