Pushed to upstream

cc/ @pablocp @cgoncas.  Reverting as it broke 1 test here: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/30/testReport/com.liferay.portlet.documentlibrary.search/DLFileEntrySearchTest/testSearchByDDMStructureField