Changes as suggested by gepetto
Merge branch 'master' of https://github.com/apache/infra-puppet
Add ldapclient. It's kinda needed