This reverts commit 7bac8b8c.

This reverts commit dd422494.

This reverts commit 71722772.

This is the most conservative approach, and allows us to switch to
master only when we explicitly decide to do so.

This is not directly tied to catkin, and prepares for the migration to other
build tools.

In preparation for migration to the new colcon-ROS2-enabled industrial_ci

See https://github.com/ros-industrial/industrial_ci/pull/361#pullrequestreview-236934549

This reverts commit 4822c855.

Apparently the port used by hkp is no longer blocked by the corporate firewall.

Default port for hkp service is blocked by our firewall and trying this adds
around 2 minutes per job until a timeout is triggered and the alternate method
of retrieving the key using wget is used.

These should've been changed before merging. Oops!