[CLEANUP] modified dependency on cpf from REFACTOR to TRUNK

@pamval please review