Merge "Do not start chef-solo if mso-docker.json is empty"