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