Added support for CFEngine 3.6