Backports of elements from the latest 2.4.x releases to ubuntu/rosdistro environments.