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

Makefile

build.xml

...floodlightcontroller/core/IFloodlightProviderService.java

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

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

...va/net/floodlightcontroller/core/web/CoreWebRoutable.java

...controller/core/web/EventHistoryTopologyLinkResource.java

...t/floodlightcontroller/core/web/SystemUptimeResource.java

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

...t/floodlightcontroller/devicemanager/internal/Device.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

...net/floodlightcontroller/flowcache/IFlowQueryHandler.java

...floodlightcontroller/flowcache/IFlowReconcileService.java

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

.../net/floodlightcontroller/flowcache/PendingSwRespKey.java

...net/floodlightcontroller/flowcache/PendingSwitchResp.java