(cherry picked from commit 48856f60)

Conflicts:
	solenv/bin/build.pl
	tomcat/tomcat.patch

Change-Id: If5b5495d767b715e7fefde1870024064947790ea