ps comamnd on linux we can specify the width of fields. The rss size is too small for us and cfengine complains:
 - Unacceptable model uncertainty examining processes

This fix issue:
 - https://dev.cfengine.com/issues/6337
Fix harmless printing of warning on Windows.
logging, indentation.
Merge pull request #1865 from jimis/cfupgrade

Cfupgrade minor fixes.
Merge pull request #1863 from basvandervlies/big_rss_value_issue_6337

ps comamnd on linux we can specify the width of fields.
Make sure VERBOSE variable is exported to testall sub-invocation.
Redmine #4822: Fix incorrect background invocation on Windows.

You cannot use shell backgrounding on Windows. And the daemon cannot
daemonize either, so the correct means is to let the promise run in
the background.
Redmine #4822: Fix incorrect sleep invocation on Windows.
Redmine #4822: Fix incorrect "tee" invocation on Windows.
Fix annoying error message when failing a test.

The maximum variable size is 4096, so set it to that instead. It
potentially won't display all the content, but it's only for display
anyway.
Update tests after most windows issues were fixed.

See the mentioned Redmine tickets for more details.
Merge pull request #1864 from jimis/win_server_admit_root

Windows cf-serverd grants access to root. Redmine 4822.
Merge pull request #1862 from kacfengine/windows_cf-serverd_testing

Redmine #4822: Improve cf-serverd tests on Windows
Update ChangeLog with 3.6.1 fixes so far.
(cherry picked from commit 0f2781e020d34c98bb7dec1ecef633038ae825ce)
My own ChangeLog entries, plus some cleaning up.
Sync ChangeLog with 3.6.1 changes.

Also, replace backticks with single-quotes so that markdown parsing
during documentation injection doesn't get confused.
Set not-kept classes when promise should be repaired, but is warn-only

There are probably more cases where Log instead of cfPS is used and
that are not covered by this fix, but this covers the immedate
issues as reported and covered by the test case.

Test case originally submitted as https://github.com/cfengine/core/pull/1311,
but merging here with the already existing test case.

See Redmine #2359.
Merge pull request #1859 from vohi/redmine/2359

Set not-kept classes when promise should be repaired, but is warn-only
Only ignore existing matches if preserve_all_lines is used

That option is documented to disable convergence, while preserve_block
should respect existing occurances of the promiser within the selected
region.

Redmine #1525
Merge pull request #1858 from vohi/redmine/1525

Only ignore existing matches if preserve_all_lines is used