Merge branch '15286-fixes'
authorWard Vandewege <wvandewege@veritasgenetics.com>
Mon, 3 Jun 2019 20:51:19 +0000 (16:51 -0400)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Mon, 3 Jun 2019 20:55:38 +0000 (16:55 -0400)
Fixes from the 1.4 branch.

refs #15286

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>


Trivial merge