Merge branch 'bdurrow-patch-1' into hotfix-1.1.2

image/service/slapd/startup.sh

@@ -123,8 +123,10 @@ EOF
 
   # start OpenLDAP
   log-helper info "Start OpenLDAP..."
-  slapd -h "ldap://$HOSTNAME $PREVIOUS_HOSTNAME_PARAM ldap://localhost ldapi:///" -u openldap -g openldap
+  slapd -h "ldap://$HOSTNAME $PREVIOUS_HOSTNAME_PARAM ldap://localhost ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL &
 
+  log-helper info "Waiting for OpenLDAP to start..."
+  sleep 5
 
   #
   # setup bootstrap config - Part 2