cfengine/core — pull request #1965 by ediosyncratic (2014-09-05 13:28:30+00:00)
Title: Fixes for things that might actually break

I've not seen these failures reported as user-visible symptoms, but the code is still wrong.
The fixes are mixed up with some clean-ups.