Correct Type From war To jar
Masked target/ From Git
Merge branch 'master' into simple_timeout

* Pulling in pom.xml and .gitignore updates