reapply fix for order of adding ros repo key