Device moved notification has to be generated when the new attachment point was already in the oldAP list.

Conflicts:
	bigfloodlight/src/main/java/com/bigswitch/floodlight/topology/BigTopologyInstance.java

Fix tabs in PortDownReconcilation and Test

Add an interface method to ITopologyService to get all the switches in the same openflow domain as a given switch id.

Fix for static flows pusher

Adjustment to attachment point logic.  If a device is learnt on OFPP_LOCAL of a switch, it will stay in that port until the switch is removed or the port goes down.  The attachment point of the device cannot be modified from OFPP_LOCAL, once assigned.

Static Flow Pusher optimizations and PacketOut buffer ID fixes

Also fixed an issue in Static Flow Pusher that would leave an orphaned flow if a static flow changed it's DPID.

FLOODLIGHT-30 - When deleting all entries put in by the static flow pusher for a specific switch or all switches   use a single delete based on matching the static flow pusher cookie instead of deleting each   flow individually.   Note: this means that flows mods are no longer hashed to have unique cookies.

Port Down Reconciliation

Merge into master from pull request #1946: openflowj: enforce buffer_id XOR payload for PacketOut (https://github.com/bigswitch/bigswitchcontroller/pull/1946)

Fixes for Floodlight-11 and Floodlight-13

FLOODLIGHT-13 -     Event history size is now configurable via net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.eventhistorysize = <int> in the properties file. FLOODLIGHT-11 -     The log message for received LLDPs that we did not send out has been updated.

subtree update

FLOODLIGHT-28 - Change the LearningSwitch FlowMod/PacketOut buffer ID logic. We now send FlowMods with BUFFER_ID_NONE and then PacketOut the packet with the buffer ID. - Add LearningSwitch properties file options to change hard/soft flow timeouts as well as priority. - Add a learningswitch.properties file.

floodlight changes to accommodate future multi-route implementation - add cookie field to all getRoute() methods

- Add getRoutes() to IRoutingService, dummy getRoutes() to TopologyManager - update Link to be comparable/sortable - add routeCount to Route - add cookie to RouteId - make NodeDist protected

Add more error checking into the links identified on ports.  Classify any ports with inconsistent links seen as broadcast domain ports.

Merge into master from pull request #1930: More resilient OF message handling with role changes. (https://github.com/bigswitch/bigswitchcontroller/pull/1930)

* Only dispatch OF messages to listeners if the switch is in the active
  switch map (and is in MASTER role and connected).
  Fixes BSC-2829
* When transitioning to MASTER: notify IHAListeners of role-change
  before starting dispatching messages. When transitioning to SLAVE:
  stop dispatching before notifying IHAListeners.
  Fixes BSC-2407

Fixes for subtree update

Fix tab in LinkDiscoveryManager; fix duplicate getInetAddress() after merge in IOFSwitch and test/../OFMessageDamperMockSwitch

subtree update