LPS-38340 Revert as it its breaking one test
Merge branch 'master' of https://github.com/liferay/liferay-portal