Pushed to upstream

cc/ @igorspasic-liferay @hhuijser Please see these failures: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/lastCompletedBuild/testReport/com.liferay.portal.jsonwebservice/JSONWebServiceStrictTest/testStrictHttpMethod/ and http://ci.liferay.org.es/jenkins/job/liferay-portal-master/lastCompletedBuild/testReport/com.liferay.portal.jsonwebservice/JSONWebServiceTest/testArgumentsMatching/