Minor changes to comply with cpf after cpk removal
Merge branch 'master' of github.com:webdetails/cdf