merged in files from ros-shell-utils