Merge pull request #1258 from cdituri/core/dirty-mailmap

Coalesce Dituri's author names in .mailmap
make masterdir configurable via configure option: --with-masterdir=<directory>
Merge pull request #1257 from maciejmrowiec/master

Add SoftDelete for map datatype
Close socket.
append masterfiles when CFENGINE_TEST_OVERRIDE_WORKDIR environment is set
sys.inputs is configurable via:
 * ./configure --with-inputdir=<directory> (default: sys.workdir/inputs)
Redmine#3983: format() %S specifier
Add acceptance test for security exception
Ensure that policy files are only writeable by the owner of the file.
Redmine#3870: acceptance test to ensure an empty template empties the file
Merge pull request #1249 from tzz/test/3842-sysvars-on-hpux

Redmine#3842: acceptance test for flavor and arch on HP-UX
Merge pull request #1267 from nickanderson/test/security_exception_other_write

Add acceptance test for security exception Ensure that policy files are only writeable by the owner of the file.
Merge pull request #1262 from jimis/socket_descriptor_leak

Close socket.
Remove timegm replacement, it is only used in Linux-only code
Use the new functions
 * GetInputDir() for inputs directory (sys.inputdir)
 * GetMasterDir()  for masterfiles directory (sys.masterdir)
Merge pull request #1264 from tzz/feature/3983-format-S-specifier

Redmine#3983: format() %S specifier
libenv/sysinfo.c: add cf-upgrade to list of components
Standardize Buffer, remove memory cap features
Warnings
Make prep step and output render correctly as code.

Everything in a #@ block is rendered verbatim, ie interpreted as
markdown.
Mark preparation steps and output in all example files as code.