Merge branch '10557-setup-cleanup'
authorTom Clegg <tom@curoverse.com>
Tue, 20 Jun 2017 20:05:01 +0000 (16:05 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 20 Jun 2017 20:05:01 +0000 (16:05 -0400)
refs #10557

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>


Trivial merge