Merge branch 'stephdl-b2902'. Refs #2902
config template: add support for LDAP addressbook. Refs #2902
Merge pull request #1 from nethesis/master

Update the source nethesis git repository