Merge zstorm-strong-ref [r=radix,jamesh]

Make ZStorm keeps strong references to named stores. Previously it only kept
weak ones, so stores were recreated more often than necessary.