Merge "Only add 'groups' file to the repo if it exists"