Merge "Fix Swift rsync/replication configuration"