Conflicts:
	src/main/java/net/floodlightcontroller/core/internal/Controller.java
	src/main/java/net/floodlightcontroller/devicemanager/Device.java
	src/main/java/net/floodlightcontroller/devicemanager/DeviceAttachmentPoint.java
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
	src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
	src/main/java/net/floodlightcontroller/routing/IRoutingDecision.java
	src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java

Initial support for OVS-style role request messages and maintaining connections with switches in a backup role [#23366119].
Added REST API to get/set the current role of the controller [#2336329].
Added simple health check REST API [#23364299].
Fixed off-by-one error in the message code values for the role request/reply messages.

Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/DeviceAttachmentPoint.java
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
	src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
	src/main/java/net/floodlightcontroller/topology/ITopologyService.java
	src/main/java/net/floodlightcontroller/topology/internal/TopologyImpl.java
	src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
	src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
	src/test/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusherTest.java

Some cleanups (https://github.com/floodlight/floodlight/pull/39)

Move getData from OFMessageFilterManager to OFMessage and remove the dependency of CoreModule on IOFMessageFilterManagerService.

New TopologyManager.  Previous TopologyImpl would simply do link discovery.  Cosmetic refactoring (renaming etc.) would be done separately.

Updates to BroadcastTree data structure; Renaming of IRoutingEngineService to IRoutingService; Updates to signatures of IRoutingService interface methods.

Introduce ILinkDiscovery as the base class from which ILinkDiscoveryService and ILinkDiscoveryListener are extended.  Introduce link types in ILinkDiscovery.  The link type is sent to all listeners.

Re-write of the Static Flow Entry Pusher. This one uses memory storag… (https://github.com/floodlight/floodlight/pull/38)

Re-write of the Static Flow Entry Pusher. This one uses memory storage notifications and supports more actions.

    Improved Module Loader REST interface (https://github.com/floodlight/floodlight/pull/37)

Fix restPort hard coding

Now can show only loaded modules and links dependencies

Added REST support for querying loaded modules

Available under /wm/core/module/list/json

Only measure the start and end time of an OFMessage if the processing… (https://github.com/floodlight/floodlight/pull/35)

Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/topology/ITopologyService.java
	src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java

Delete methods in IRoutingInterface that refer to switch objects.  [It is also not  used anywhere in the code as of now.]