FACES-1916 Upgrade to Liferay 6.2.1 API