www/apache-tomcat85: Update to 8.5.58

Changes for 8.5.59:
  - Refactor the handling of closed HTTP/2 streams to reduce the heap usage
    associated with used streams and to retain information for more streams in
    the priority tree.
  - Deprecate the JDBCRealm.
  - Ensure that none of the methods on a ServletContext instance always fail
    when running under a SecurityManager.

Full changelog is available at:
https://tomcat.apache.org/tomcat-8.5-doc/changelog.html#Tomcat_8.5.59_(markt)

Also CONFLICTS have been adjusted.

(otis)