Merge remote-tracking branch 'floodlight/master'

...floodlightcontroller/core/IFloodlightProviderService.java

...n/java/net/floodlightcontroller/core/IHARoleListener.java

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

.../java/net/floodlightcontroller/core/web/RoleResource.java

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

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

...a/net/floodlightcontroller/topology/ITopologyService.java

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

...loodlightcontroller/ui/web/IStaticWebRoutableService.java

...va/net/floodlightcontroller/ui/web/StaticWebRoutable.java

...loodlightcontroller/core/test/MockFloodlightProvider.java

...ller/linkdiscovery/internal/LinkDiscoveryManagerTest.java

...floodlightcontroller/staticflowentry/StaticFlowTests.java

...ava/net/floodlightcontroller/test/FloodlightTestCase.java

...et/floodlightcontroller/topology/TopologyManagerTest.java