Don't truncate IPV6 addresses in cf-key -s output
Don't truncate IPv6 addresses in cf-key -s output (part2)
Merge remote branch 'upstream/master'
Do not call SetPolicyServer(NULL), this is a programming error!
GetIdleConnectionToServer: Do not log ipaddr if it didn't resolve.
Verbose message was deceptive.
Fix redmine #2810

During bootstrapping the keys are created during the first promise pass, so
they need to be read from the files when the agent tries to connect to the
server in the second pass, else bootstrapping fails.
Don't try to connect without keys when bootstrapping

so that connection is tried on second or third promise pass of failsafe.
Don't give instructions for previous releases, we know we are running a current release.
Don't complain about bootstrapping failure if keys are not there

... since the keys will be generated from the "commands" promise.
Output error about missing key *before* generating it.
add new canonifyuniquely function
Close down acceptable ciphers in server.
Added forgotten Copyright - License preamble.
Added "allowciphers" option in body server control.
Redmine#1884: Add ^context=xyz specifier to module protocol, with acceptance test
Remove test for Enterprise.

There is no compile test anymore, and I can't see a reason why this
code should not be in both versions.
Don't hardcode lock-runlog file rotation, let it to logrotate() bundle
Redmine#3320: acceptance test
Redmine#2516: add "int", "real", "mac", "ipv4", and "ipv6" options to sort function