cfengine/core — pull request #1818 by kacfengine (2014-07-07 12:15:43+00:00)
Title: [3.6.x] Users promise fixes 3.6.x

@vohi: Some 3.6.x cherry-picks with conflicts pre-resolved!