Conflicts:
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/manager/internal/BVSManagerImpl.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/VirtualRouterManager.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/VirtualRouting.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/virtualrouting/serviceinsertion/internal/ServiceInsertionServiceImpl.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/web/FlowCacheMgrResource.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/flowcache/BigFlowCache.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/flowcache/BigFlowReconcileManager.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/forwarding/Forwarding.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/manager/internal/BVSManagerImplTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/ArpManagerTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/DhcpManagerTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/VirtualRoutingHintTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/VirtualRoutingTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/serviceinsertion/internal/ServiceInsertionServiceEndToEndTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/flowcache/BigFlowCacheTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/flowcache/BigFlowReconcileMgrTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/forwarding/PushRewriteRouteTest.java
	floodlight/src/main/java/net/floodlightcontroller/core/internal/Controller.java
	floodlight/src/main/java/net/floodlightcontroller/core/util/AppCookie.java
	floodlight/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	floodlight/src/main/java/net/floodlightcontroller/flowcache/FlowCache.java
	floodlight/src/main/java/net/floodlightcontroller/flowcache/IFlowCacheService.java
	floodlight/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java

Havana demo (https://github.com/bigswitch/bigswitchcontroller/pull/3208)

Add AppCookie.registerApp() and block flow mod cookies (https://github.com/bigswitch/bigswitchcontroller/pull/3237)

Ordering of modules for HA role change. (https://github.com/bigswitch/bigswitchcontroller/pull/3235)

Check to make sure all switches on the path are active before establishing a flow-mod.  Add a unit test to verify this is the behavior.

Also get rid of IOFSwitchFilter which is unused

Conflicts:
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/web/ExplainResource.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/forwarding/Forwarding.java
	bigfloodlight/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
	bigfloodlight/src/main/resources/bigfloodlight.properties
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/serviceinsertion/internal/ServiceInsertionServiceEndToEndTest.java

* consolidate store after SLAVE->MASTER transition
* more unit tests for Controller and OFChannelHandler
* fix some issues found while unit testing

Remove portBroadcastDomainLink map from link discovery as it does not affect correctness.  Remove unused variable and uncalled method.