WS-addressing action not picked up on wrapped style operations

When ws-addressing is used with a wrapped operation, the action specified in @WebMethod is not picked up.

bindingOpInfo.getExtensor(SoapOperationInfo.class) returns null in line 792 in org.apache.cxf.ws.addressing.ContextUtils and therefore the action becomes null.

It seems to work if the following lines (774-776):
if (bindingOpInfo.isUnwrappedCapable())

{ bindingOpInfo = bindingOpInfo.getUnwrappedOperation(); }

is replaced by
if (bindingOpInfo.isUnwrapped())

{ bindingOpInfo = bindingOpInfo.getWrappedOperation(); }