[ros-diffs] [dreimer] 29187: Update Variables to support recent trunk.