Merge 58800698-mavericks to master

[Completes #58800698]
Document revised Tomcat detection criteria

[#57611752]
Fix doc syntax