UP-4205, SSP-2721 Add and map Filter blocking CVE-2014-4172 .

Includes a squash of subsequent static import cleanup and other
test class refactors

Conflicts:
	uportal-war/src/main/webapp/WEB-INF/web.xml