cfengine/core — pull request #1769 by kacfengine (2014-06-25 13:26:32+00:00)
Title: 3.6.x Cherry-picks

File monitoring and David Volgyes' fixes.