15345: Merge branch 'master' into 15345-kill-container-api
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 24 Jun 2019 15:25:49 +0000 (11:25 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 24 Jun 2019 15:25:49 +0000 (11:25 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge