Pushed to upstream

cc/ @rotty3000 Please see this failure: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2225/testReport/junit/com.liferay.portal.security.pacl.test/HookTest/testServices1/