Merge pull request #3228 from nd368/master

[STORM-3306] TopologyIntegrationTest.java use TopologyBuilder to build topologies not Thrift