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

...main/java/net/floodlightcontroller/core/OFSwitchBase.java

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

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

...odlightcontroller/devicemanager/IEntityClassListener.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

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

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

...va/net/floodlightcontroller/topology/TopologyManager.java

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