Merge branch '9437-keep-index-ns'
authorTom Clegg <tom@curoverse.com>
Fri, 1 Jul 2016 17:53:21 +0000 (13:53 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 1 Jul 2016 17:53:21 +0000 (13:53 -0400)
refs #9437

See https://dev.arvados.org/issues/9437#note-3 and #note-4


Trivial merge