[releng] PR #6735: Rsync changes to support primary and alt arches