Merge branch '11948-cwl-conformance-fix'
authorTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:39 +0000 (15:33 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:39 +0000 (15:33 -0400)
refs #11948

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>


Trivial merge