WCM-188 Use latest release of Liferay OSGI Util
WCM-188 Add missing non-optional imports