Remove texinfo markers that confuse liquid - try markdown
(cherry picked from commit b2b2a9ebe3488b332829300671adf251964094ad)
Fix missing "promise kept" status for the last line in a file.

For the last line we shortcut out using MatchRegion, but previously
we did not set the promise status.

Fixes issue 2943.
(cherry picked from commit 3c75e08892ac5f4092ec79f53cba8d1f3a08c76f)
Autotest fails because of cached bundle result. Fix by splitting.
(cherry picked from commit 18a831d23c88b15b232be51548f784a5fb6d51ce)
Add fix for 2943 again
Ignore result of this test for now.

After library split, promises.cf depends on cfengine version classes
and sys.version variables to be set.
(cherry picked from commit b6837437f3a54125d1b545049fe2afc8888b4f65)
Factor out DiscoverVersion in sysinfo, use in generic_agent_test:test_masterfiles
(cherry picked from commit d1d45308a518efd5f12a00fa7348d707856da667)
Merge remote-tracking branch 'upstream/3.5.x' into 3.5_surfsara