Pushed to upstream

cc/ @peterfellwock @rotty3000. Please review failures here: Remove test that does not apply, as it was registrified: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2337/testReport/junit/com.liferay.portal.security.pacl.test/HookTest/testPortalProperties2