Backout changes
Merge branch 'release-55' into backout-log4j-changes

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge pull request #1132 from xschildw/backout-log4j-changes

Backout log4j changes