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