Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

src/main/java/net/floodlightcontroller/core/RoleInfo.java

...va/net/floodlightcontroller/core/internal/Controller.java

src/main/java/net/floodlightcontroller/packet/ICMP.java

...t/floodlightcontroller/storage/AbstractStorageSource.java

...a/net/floodlightcontroller/topology/TopologyInstance.java

...et/floodlightcontroller/core/internal/ControllerTest.java