Merge branch '14328-containerd'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 9 Nov 2018 19:00:54 +0000 (14:00 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 9 Nov 2018 19:00:54 +0000 (14:00 -0500)
closes #14328

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge