Update to reflect new version numbering plans
Update to reflect new version numbering plans

I wouldn't normally do this but I think it makes sense in order to
reduce opportunities for user confusion.
apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat