Housecleaning

Getting deeper into code and cleaning as I go.  Prior to this build,
locally I had 5 test cases with ignore.   All seem consistently working
now.  This batch doesn't appear to have done anything that would have fixed it but consistent runs are good.  No ignores anywhere in code base now on unit tests.

Updating dependencies
Updating legacy ${basedir} to ${project.basedir} in maven poms
Fixing formatting where spaces used instead of standard tabs in this project
Sync tomcat code bases as best possible
Updating jetty piece to use consistent dependencies (ie it had servlet
2.5 but jetty version expected newer, etc)