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

apps/circuitpusher/circuitpusher.py

...ava/net/floodlightcontroller/core/FloodlightProvider.java

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

...dlightcontroller/core/IOFMessageFilterManagerService.java

...n/java/net/floodlightcontroller/core/IOFSwitchDriver.java

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

...t/floodlightcontroller/core/internal/CmdLineSettings.java

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

...a/net/floodlightcontroller/core/internal/RoleChanger.java

...dlightcontroller/core/module/FloodlightModuleContext.java

...ightcontroller/core/module/FloodlightModuleException.java

...odlightcontroller/core/module/FloodlightModuleLoader.java

...t/floodlightcontroller/core/module/IFloodlightModule.java

...lightcontroller/core/module/IFloodlightModuleContext.java

.../floodlightcontroller/core/module/IFloodlightService.java

...loodlightcontroller/core/module/ModuleLoaderResource.java

...floodlightcontroller/core/web/ControllerRoleResource.java

...troller/core/web/EventHistoryTopologyClusterResource.java

...controller/core/web/EventHistoryTopologyLinkResource.java

...ntroller/core/web/EventHistoryTopologySwitchResource.java