12552: Merge branch 'master' into 12552-wf-priority
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 14 Mar 2018 18:15:15 +0000 (14:15 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 14 Mar 2018 18:15:15 +0000 (14:15 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge