Clean up 7-1-stable branch
This reverts !321 (merged) to have a sane 7-1-stable branch for when we want to create patches targeting GitLab 11.5.
I decided to keep !309 (merged) because it's a bug fix and I just like the idea that we can build 7-1-stable with Go 1.11 if we have to.