Pushed to upstream

cc/ @shuyangzhou. Please review failures here: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2299/testReport