Sync with liferay/liferay-plugins