13025: Merge branch 'master' into 13025-keepstore-metrics
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 12 Feb 2018 19:53:50 +0000 (14:53 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 12 Feb 2018 19:53:50 +0000 (14:53 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge