Increase timeout in acceptance test for our slow Solaris machine.
(cherry picked from commit ab3383ac93bd4094379834fce78814dacfc8a279)
Update test results for Solaris 10.
(cherry picked from commit dae8715241d453137517916f8492d490c619d62a)
Remove incorrect comment.
(cherry picked from commit ebb8b789188ab6bab2edc30579d97504ed04bac9)
Update with latest test result status for Solaris 10.
(cherry picked from commit 8b35070793ff7abc96d766a6f06ae44fce633b88)
Update acceptance test status for Solaris platforms.
(cherry picked from commit 6d2aec9d053d201c9f380311facce0c9c090eefd)
Merge pull request #2006 from kacfengine/3.6.x_test_status

3.6.x test fixes for Solaris
Make sure we get correct number (3) from wc by specifying line count.
(cherry picked from commit f89ba4e12964b4cbe0f833d1131ea27a4da7fefc)
Add "ls" to tools list, used in 10_files/03_transform/003.cf.
(cherry picked from commit bf26abdb1bdf33d20974eb25168f0d138435afcb)
Fix sporadic failure of 10_files/03_transform/003.cf.

Don't use the same directory to hold the counter as the one who holds
the transformed files. Otherwise it may or may not be included
in the result, depending on file system order, since we use depth
search.
(cherry picked from commit 5909c367861910f80381a0d5d9f918bb04a1abb1)
Switch to egrep. "grep -E" is not portable to Solaris grep.
(cherry picked from commit b3595d75f070264f3a67e61b145dfe2360a064ff)
Soft fail test in Solaris 11 chroot env, where it cannot pass.
(cherry picked from commit 6922ecb4fd10d25fd76178abf92799b04c8409e8)
Redmine #6599: Enable disk free monitoring on Windows.

(cherry picked from commit 939ddc9c90eca80df51fe98b57aa832f06759131)
Redmine #6590: Add leaner version of Solaris MAC address detection.

Also made sure that Solaris does not select the getifaddrs version,
since although the function is available, it cannot actually be used
to get the MAC address.

And removed a suppressed failure for Windows which is not correct
anymore.
(cherry picked from commit 797e936c7c747c3373ac10d63fa23509c4f19c86)

Conflicts:

	tests/acceptance/01_vars/03_lists/016.cf
Redmine #6590: Revert "add implementation of getifaddrs for solaris"

This reverts commit debbe3e770dd1ff8e2211ba2c2d3e5d2cbc36739.

Conflicts:

	libpromises/Makefile.am
	libpromises/solaris_ifaddrs.c
	libpromises/solaris_ifaddrs.h
	libpromises/unix.c
(cherry picked from commit 49b08bdaf3dce5756e2afe4cb00d384660a58e45)
Fix a few parsing bugs that can allow for silent truncation of valid JSON
(cherry picked from commit c59c9276a91fbd02d486cef9ab8a3eaedceb1309)
Eliminate pointless intermediary in JsonParseFile()

We're going to write to the pointer we were passed in any case, so we
may as well pass that into the parser for it to write to, instead of
having our own local variable to passdown and then copy to the pointer
we received.
(cherry picked from commit 1812325c7e0fb8788056b7963ce01c56e6662543)
Hard error on JSON truncation
(cherry picked from commit cbf48eec43397a4891827b1c619bade63a80ac04)
redmine6549: Tolerate unrecognised escape sequences.

We have no way to represent \u{hex digit} escapes for Unicode, which
are perfectly valid JSON; so we need to tolerate these in some form
rather than choking on them.  Given that the only sane way to do so is
to preserve them verbatim, we may as well do the same for any other
unrecognised escapes.  This eliminates the need for an error code to
represent unrecognised escape.

Log() a warning when handling an escape verbatim, though; which, in
turn, requires a #include <logging.h>
(cherry picked from commit 95f8d71a59a064ad22535529da44a6ad958206f7)
Redmine #6623: Fix agents constantly retrying long running promises.

The expireafter default should be two hours, but it was erronously set
to one minute in the initialization code, so remove that and stick to
the globally set value.

This fixes the problem where, when transferring a large file that
takes longer than the execution interval to finish, no agent will ever
succeed. What happens is that if a second cf-agent starts downloading
the same file, locking will not prevent the attempt, despite already
being in progress by the first agent. No agent will ever succeed,
because the second agent will delete the temporary file created by the
first agent, then create its own temporary file, which will be deleted
by the third agent, and so on.
(cherry picked from commit 56eec440dd1b13c6c5e236af7b2a711c892250e9)
Update test result status for Solaris 11.

All cf-serverd tests are passing now, yey! Also remove freebsd, since
we don't test it in Jenkins, and the mentioned Redmine ticket is not
for that platform.
(cherry picked from commit daee0e3c72654c4a754eed3b073ae6be07bf29f8)