Cherry Pick I don't know detail
add tomcat build plugin 
Conflicts:
	pom.xml
validate
validate 2
i don't know
resorve conflict