Merge branch '15864-controller-fixes'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 29 Nov 2019 07:46:15 +0000 (02:46 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 29 Nov 2019 07:46:15 +0000 (02:46 -0500)
refs #15864

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


Trivial merge