Merge "Specify a separate dir for vhost_user sockets"