Merge "Run rsync for Swift without xinetd"