STORM-497: don't modify the mapping while the someone could be reading it.
Merge branch 'STORM-497' of https://github.com/revans2/incubator-storm into storm-497
STORM-497: update changelog.md