Merge branch '11968-ws-startup-crash'
authorTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:53 +0000 (15:33 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:53 +0000 (15:33 -0400)
closes #11968

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


Trivial merge