Rsync with the Opscode 11.6-stable branch