Merge remote-tracking branch 'bigswitch/master' into misc

.gitignore

build.xml

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

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

.../net/floodlightcontroller/flowcache/OFMatchReconcile.java

...loodlightcontroller/flowcache/PortDownReconciliation.java

.../java/net/floodlightcontroller/forwarding/Forwarding.java

...ava/net/floodlightcontroller/routing/IRoutingService.java

src/main/java/net/floodlightcontroller/routing/Link.java

src/main/java/net/floodlightcontroller/routing/Route.java

src/main/java/net/floodlightcontroller/routing/RouteId.java

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

...a/net/floodlightcontroller/topology/ITopologyService.java

...a/net/floodlightcontroller/topology/TopologyInstance.java

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

.../net/floodlightcontroller/topology/web/RouteResource.java

...lightcontroller/flowcache/PortDownReconciliationTest.java

...java/net/floodlightcontroller/routing/ForwardingTest.java