Merge branch 'master' into 'cleanup'

# Conflicts:
#   scripts/config_sites.json

0111.node_worker_desktop.cfg

@@ -23,9 +23,12 @@ HyperthreadOverbook     = 2.0
 DOCKER = $(ETC)/git/scripts/docker_wrapper.py
 
 #Docker mounts
-DOCKER_VOLUMES = $(DOCKER_VOLUMES), NSCD
+#Docker mounts
+DOCKER_VOLUMES = $(DOCKER_VOLUMES), NSCD, NSLCD
 DOCKER_VOLUME_DIR_NSCD = /var/run/nscd
-DOCKER_MOUNT_VOLUMES = $(DOCKER_MOUNT_VOLUMES), NSCD
+DOCKER_VOLUME_DIR_NSLCD = /var/run/nslcd/socket:/var/run/nslcd/socket
+DOCKER_MOUNT_VOLUMES = $(DOCKER_MOUNT_VOLUMES), NSCD, NSLCD
+
 
 
 ##Dynamic Resources