UP-3708

Conflicts:
	uportal-war/src/main/resources/layout/structure/columns/columns.xsl