Pushed to upstream

Rolling back because there are 122 tests failing (please see http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2122/testReport), cc/ @natecavanaugh @ethib137