Merge branch '11908-properties-column-json'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 8 Dec 2017 18:49:34 +0000 (13:49 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 8 Dec 2017 18:49:34 +0000 (13:49 -0500)
refs #11908

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


Trivial merge