Enhance Logging Usage / Formatting

**** This is a rather large overall change due to logging/formatting changes - Review with care ***

Replace string concatenation with use of {} of slf4j
Properly format spaces back to tabs on newer code
Tomcat tests are flaky, ignore them for time being.
I'll remove the commented out code.  I wasn't entirely sure of its original purpose so I had just left it.  However, since jetty piece is now working, it is entirely plausible that this is simply junk now.