Merge remote-tracking branch 'floodlight/master' into addrspace

...net/floodlightcontroller/core/OFMessageFilterManager.java

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

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

...a/net/floodlightcontroller/core/internal/RoleChanger.java

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

...dlightcontroller/core/web/ControllerSwitchesResource.java

...ntroller/core/web/serializers/ByteArrayMACSerializer.java

...tcontroller/core/web/serializers/LinkTupleSerializer.java

...ightcontroller/core/web/serializers/UShortSerializer.java

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

...odlightcontroller/devicemanager/IEntityClassListener.java

...ghtcontroller/devicemanager/IEntityClassifierService.java

...oller/devicemanager/internal/DefaultEntityClassifier.java

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

...n/java/net/floodlightcontroller/flowcache/FCQueryObj.java

...et/floodlightcontroller/flowcache/FlowCacheQueryResp.java

.../floodlightcontroller/flowcache/FlowReconcileManager.java

...net/floodlightcontroller/flowcache/IFlowCacheService.java

...floodlightcontroller/flowcache/IFlowReconcileService.java

...et/floodlightcontroller/linkdiscovery/ILinkDiscovery.java