Break up Gitaly [gitlab-shell] config into [gitlab-shell], [gitlab], and [hooks]

This MR reverts the revert of 5a24d961 which happened in !2196 (merged).

There was a bad merge (out of date branch) which resulted in a broken master. This MR restores those changes, and adds a commit to fix the bad merge.