Merge pull request #564 from jasonjckn/0.9.0

remove usage of immutablemap in systembolt.