Feature/ldap 494

I've changed our puppet environment to not rely on your fork of puppetlabs-apache anymore, but kept the changes in feature/ldap-494. I merged in the latest upstream changes in my fork of feature/ldap-494, if you care to merge those back into yours.