Fixed compile failures due to API changes in 6.2 master branch of liferay-portal