contrib/cfengine.el: add 25.1 compatibility code and clean up
Merge pull request #2015 from tzz/tzz/cfengine.el

contrib/cfengine.el: add 25.1 compatibility code and clean up