Merge "Fix paths for optional docker services"