Cleanup plugin name change from manual merge of tomcat8 repo