BZ-991058 - Imports for MVELSafeHelper fixed