Revert "fix devel jobs not handling ros/catkin#639 well with the changed...

Reverts ros-infrastructure/jenkins_scripts#73