stable build 2
stable build 3
stable build 3
Merge branch 'master' of https://github.com/University-of-Potsdam-MM/liferay-portal

Conflicts:
	portal-impl/test/unit/com/liferay/portal/fabric/status/RemoteFabricStatusTest.java