14199: Merge branch 'master' into 14199-copy-from-remote
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 9 Oct 2018 19:56:26 +0000 (15:56 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 9 Oct 2018 19:56:26 +0000 (15:56 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge