12933: Merge branch 'master' into 12933-log-node-properties
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 11 Jan 2018 16:50:13 +0000 (11:50 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 11 Jan 2018 16:50:13 +0000 (11:50 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge