Fixes #4487: prevent the removal of blank lines in template (backport of cfengine f0dd1f0483fe5f234c9dc82405a057e4d6db0b10)
Merge pull request #230 from ncharles/bug_4487/dev/prevent_blank_lines_in_template

Fixes #4487: prevent the removal of blank lines in template (backport of...
Fixes #4553: upgrade to cfengine 3.5.3, and take also commits to finish safe_open and logging
Merge pull request #245 from ncharles/bug_4553/dev/upgrade_to_cfengine_3_5_3

Fixes #4553: upgrade to cfengine 3.5.3, and take also commits to finish ...
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9'