Merge "CSD: rename get/setOutputRs2 to include upper bound" into udc-dev