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'
Redmine#3251: add and remove GMT versions of all the hard time classes
Add OpenLDAP Lightning Memory-Mapped DB

Also modified by jeffali <hichame.jeffali@cfengine.com>:

    Add LMDB support (TCDB is still the default option)
Adapting CFE locks to lmdb length limit (and fixing unit test)
Do not hash license tracking locks
Make GenerateMd5Hash optional
Make hashing locks optional (only if lmdb is chosen)
Merge pull request #962 from kacfengine/lmdb

Remerge of LMDB after fixing authorship
Fixing a problem on the TLS generic test

SSL_READ_RETURN needs to be smaller than the size of the buffer for
this test to work.
Merge pull request #963 from cduclos/fixing-broken-build

Fixing a problem on the TLS generic test
Fixing the real cause for the TLS test failure

The mocking function for SSL_read was returning the value that I assigned,
regardless of the size of the buffer. This commit fixes that, if the buffer
is smaller than the value assigned, then the size of the buffer is returned
instead. Same fix was applied to the write function.
Merge pull request #964 from cduclos/fixing-broken-build

Fixing the real cause for the TLS test failure
Merge pull request #842 from tzz/tzz/redmine-3251-GMT-0

Redmine#3251: add and remove GMT versions of all the hard time classes
Merge pull request #799 from JarleB/master

Don't truncate IPV6 addresses in cf-key -s output
Refs #3395: adding support for openvz
Merge pull request #956 from ncharles/openvz_support_master

Refs #3395: adding support for openvz