Liferay 6.2 compatibility (#11751)

Change-Id: I5a14aba47f3e92249b245392acaf5ff9bda62083