[ros-diffs] [greatlrd] 25665: merge trunk rev : 25656 to 0.3.1 branch - fixing my rmap problem in vmware