Merge branch 'master' of github.com:floodlight/floodlight

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

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

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

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

...ightcontroller/core/web/serializers/UShortSerializer.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

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

src/main/java/org/openflow/protocol/OFPhysicalPort.java

.../floodlightcontroller/flowcache/FlowReconcileMgrTest.java