Pushed to upstream

cc/ @shuyangzhou @laszlocsontos. Please review failures here: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2258/testReport/junit/com.liferay.portal.scheduler.quartz/QuartzSchedulerEngineTest/testDelete2/