replaced tabs by spaces
added a note that the ps command on linux has been change to adopt for big rss values.

Modified by Kristian Amlie <kristian.amlie@cfengine.com>
(cherry picked from commit 75448130fe519815e17012e5c81dfe02bc0c2b75)
Don't invoke bundle if methods promise is warn-only.

However, do invoke the bundle if the agent run is a dry-run.

See Redmine #5924

(cherry picked from commit 65c15626992d608eaa51ca3d47b6ccf4e8058576)
Call service methods even in dry-run mode.

Otherwise the promises inside the method are not evaluated at all,
and no insight is provided into whether cf-agent would have modified
the system.

Since the promises then respect DRYRUN mode, nothing will changed
on the system.

If action_policy is set to warn_only, the methods promise will
respect that and not evaluate the bundle.

This follows up on commit 65c15626992d608eaa51ca3d47b6ccf4e8058576.

See Redmine #5924

(cherry picked from commit 3bebc908e051fed5889338a0bd4a96d38044a194)
Update ChangeLog with fix for #5924

(cherry picked from commit 925e78c7b6fc048ee6885afd51782d9c9984baf3)
RedMine 6397 mitigation: use alternate column instead of empty.

In SplitProcLine(), we parse the line two ways; if the two don't
agree, we winge about it; but we use the first one anyway.  We see
some cases where Solaris ps gets a better answer from the second than
from the first; so use the second by default and fall back to the
first if it's empty.

(cherry picked from commit a5cf6071045e49df8008a08651582064c45c7b68)
Redmine #6421: Fix incorrect newline mode when reading in execresult.

The output is expected to be text, so it should be read in text mode,
converting "\r\n" to "\n" in the resulting variable.

(cherry picked from commit 7f32ae03bf6d04199aae1ae94ed4ce671c76d520)
Remove revision from version tag for 3.6.1 packages.
Changelog entry for LMDB robustness patch.

(cherry picked from commit 90a30222d0a1c7acd34bb22fdc844b03d2529c2e)
disable failing unit test redmine 6314
(cherry picked from commit b25c41f69ae76845c8702353784ef22f091a0c86)
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x