Merge remote-tracking branch 'upstream/master'

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...ghtcontroller/devicemanager/internal/AttachmentPoint.java

...t/floodlightcontroller/devicemanager/internal/Device.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

...va/net/floodlightcontroller/topology/TopologyManager.java

...troller/devicemanager/internal/DeviceManagerImplTest.java

...troller/devicemanager/internal/DeviceUniqueIndexTest.java

...t/floodlightcontroller/devicemanager/test/MockDevice.java

...lightcontroller/devicemanager/test/MockDeviceManager.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java