Merge branch '11910-ws-test-race'
authorTom Clegg <tom@curoverse.com>
Fri, 30 Jun 2017 17:56:18 +0000 (13:56 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Jun 2017 17:56:18 +0000 (13:56 -0400)
closes #11910

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


Trivial merge