[ros-dev] 14725 breaks the bootcd and livecd