Merge branch '7167-keep-rsync-test-setup' into 7167-keep-rsync
authorradhika <radhika@curoverse.com>
Wed, 7 Oct 2015 20:49:15 +0000 (16:49 -0400)
committerradhika <radhika@curoverse.com>
Wed, 7 Oct 2015 20:49:15 +0000 (16:49 -0400)

Trivial merge