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