Only load Net::LDAP if it's needed
Merge remote-tracking branch 'origin/master' into vagrant
Fixed vagrant bootstrap