Fix use of imports inconsistent with liferay standards