[ros-dev] Future merge of the ros-csrss branch into the trunk