cfengine/core — pull request #2043 by jimis (2014-11-26 05:10:27+00:00)
Title: 3.6.x cherry-picks

From commits in master branch by @jimis and @kacfengine.