LRDOCS-1490 Rebased changes on master and fixed liferay-aui.xml