This simplifies a packaging complexity later when bnd is used more extensively.
https://github.com/apache/tomcat/pull/300
Fixed in: - master for 10.0.0-M7 onwards - 9.0.x for 9.0.37 onwards - 8.5.x for 8.5.57 onwards - 7.0.x for 7.0.105 onwards Thanks for the PR.