Merge "swift: Fix the empty gid option in rsyncd.conf"