7931: Merge branch 'master' into 7931-replicas-by-volume
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 23 Mar 2018 18:11:35 +0000 (14:11 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 23 Mar 2018 18:18:26 +0000 (14:18 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge