Rename update.cf bundle names to fit internal naming schema.
(cherry picked from commit 92d901ca3ffe287651b225d4ef0c3d2c31d9d476)
add some classes to not display some messages when people run hardcoded failsafe many times

Conflicts:

	src/bootstrap.c
Fix incomplete conflict resolution in: 8cad2dda4afbc970a538b1b038cce41e82db495b
Pre-release version bump.
Post-release version bump.
check for null Promise *pp before dereferencing
(cherry picked from commit 6c65953ad3a7bfdc1b14024bb8807e89c291a231)

Update ChangeLog.
don't create a symlink in /usr/local/sbin for cf-know in Community policy. cf-hub and cf-know were removed since 3.4.0
(cherry picked from commit 597a15472179636a5903d343d3ab8773bf6fb3da)

Updated ChangeLog
Check for function: xmlFirstElementChild in library: libxml2, in order to insure that the
current version of libxml2 is installed.
(cherry picked from commit ef3adaa3d342c3b7210f46ffb1b3f2e2b0d25f29)

Update ChangeLog.
Pre-release version bump.
Post-release version bump.
Backport fix for qualified array expansion from trunk.

$(other.array[$(other.list)]) would expand to
$(other#array[$(other.list)]) in output due to issues mapping remote
lists to "this" scope. Fix skips the outer "." to properly map.

Fixes Issue #1998, Mantis #1128

Originally Pull #421
Do an optimization/issue-correcting step during opening the database

Optimization step detects broken databases, so it lowers chances of agents
hanging forever or segfaulting inside libtokyocabinet.
(cherry picked from commit 85c165bd072a1c5a64c11faa7d1541f555226df5)
Don't provoke database corruption by mixing read/write and cursor operations
(cherry picked from commit 15176584a52ffa09bef437a04c2a07985753aea9)
Update ChangeLog
(cherry picked from commit 34ac47fd786e9003dc15359b8ad52c0029bfc365)

Conflicts:

	libpromises/mod_exec.c
Changelog update
Fixes Redmine #1855: don't close file descriptors we use
Unlock cft_count lock before returning in case of empty list.

'list' should never be NULL, given that the function receives the address of the
list pointer, and the only call passes in &CONNECTIONLIST.

This fixes up commit e302e38e0efdb33fcd53ec7acc41686214dbc6ea
(cherry picked from commit f561f5eceb22881ab8f86119645cc08ccaa3a0ca)
Don't protect malloc call with system mutex in main server loop.

Not required to synchronize malloc calls, it's threadsafe on all supported platforms.

This partially backports f55a6610fbfcd078c1e2a58cd0da94efef35cc2d
Backport fixes to race conditions and file permissions in
file editing.

Previously the original was removed and then the edited file was
renamed, leaving a small timeframe where the file did not exist, which
can lead to bad situations. Fixed by leaving the file in place until
rename is called, which is atomic on all POSIX platforms.

Also make sure all permissions, including ACLs and SELinux security
contexts, are preserved when making a copy of the original file.

Fixes issue 2545.

Conflicts:
	cf-agent/files_operators.c
	cf-agent/files_operators.h
	src/acl.h

(cherry picked from commit a3f1a964ad5e079f8abc419bb9e0489aa8c62f7a)
(cherry picked from commit 908fb187191b41df44bdfb7d092a429cded06436)
(cherry picked from commit 76d895609ea7dee55502139acf52b1b141ca9b10)