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.
Kill comments like this one, please. Deleted code should be ... deleted.