Fixes for liferay 6.2 configurations