Merge r1561040 from trunk: Using UDS, we sometime try ops not supported on UDS. Make this a known (and therfore handable) issue Reviewed/backported by: jim