Merge "Define vhost_socket_dir in neutron section"