changes to ensure backward compatibility with tomcat
updating poms for 2.1.1 release
Merge branch 'feature/tomcat_compatibility' into release/2.1.1

* feature/tomcat_compatibility:
  changes to ensure backward compatibility with tomcat
updating poms for 2.1.1 release
Merge branch 'release/2.1.1' into develop
updating poms for 2.2.0-SNAPSHOT development