Merge "Add check that service tag isn't in path name"