It's fixed to master branch but not other branches. I backported this to 1.x and 1.0.x branch and pushed.
cherry-picked commit is 9165b603985c0c158821cd5a20e6c509ee63342a <https://github.com/apache/storm/pull/1161/commits/9165b603985c0c158821cd5a20e6c509ee63342a> Thanks, Jungtaek Lim (HeartSaVioR)
