Preparing 3.5.1 release
Handle specific Debian path: /etc/init.d/ssh instead of /etc/init.d/sshd
(cherry picked from commit ed86022ae438926930224f789b0da486bdeed171)
cfengine_stdlib.cf: split into 3.4/3.5/3.6 versions.  Add sys.cfengine_version_{major,minor,patch} and use it to load the right libraries for 3.6 and later.  Split by promise type for 3.5 and 3.6.
(cherry picked from commit b87b46ba213d23284635b5aa68cc1f9fbdca318f)
ChangeLog entry for stdlib split (#3044)
Fix symlinks being destroyed when editing them.

With this fix we dereference the link and edit the pointed-to file
instead.

Fixes issue 2363.
(cherry picked from commit 58a897220c3c9f2f20f05b3562dbe5c6bbe50269)
Include fix for 2363
Merge remote-tracking branch 'upstream/3.5.x' into 3.5_surfsara