Merge remote-tracking branch 'maiergre/master' into ha-role

build.xml

setup-eclipse.sh

src/main/java/net/floodlightcontroller/core/IListener.java

...ava/net/floodlightcontroller/core/IOFMessageListener.java

...va/net/floodlightcontroller/core/internal/Controller.java

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

...odlightcontroller/core/module/FloodlightModuleLoader.java

...ontroller/core/web/serializers/OFMatchJSONSerializer.java

...et/floodlightcontroller/devicemanager/IDeviceService.java

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

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

...t/floodlightcontroller/devicemanager/internal/Entity.java

...loodlightcontroller/flowcache/IFlowReconcileListener.java

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

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

...t/floodlightcontroller/learningswitch/LearningSwitch.java

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

src/main/java/net/floodlightcontroller/packet/Ethernet.java

...java/net/floodlightcontroller/routing/ForwardingBase.java

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