STORM-329: fix a integration issue
Merge branch 'master' of https://github.com/tedxia/incubator-storm