Tweak format to simplify diffs against 8.5.x to make it easier to check
Tweak format to simplify diffs against 8.5.x to make it easier to check
apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat