Merge into master from pull request #298:

Update to attachment point port.  newAP is given preference if it is not a broadcast domain port and its active time is later than oldAP. (https://github.com/floodlight/floodlight/pull/298)

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -277,6 +277,9 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
 
             long activeOffset = 0;
             if (!topology.isConsistent(oldSw, oldPort, newSw, newPort)) {
+                if (!newBD && oldBD) {
+                    return -1;
+                }
                 if (newBD && oldBD) {
                     activeOffset = AttachmentPoint.EXTERNAL_TO_EXTERNAL_TIMEOUT;
                 }