Group Makefile targets into respective sections

This MR tidies up the Makefile so each section (gitlab, gitlab-shell etc) has a heading and all related targets are neatly grouped together.

This MR needs !968 (merged) merged first.