Defer more gitlab.yml defaults to upstream
Merge branch 'gitlab.yml_defaults' into 'master'

Defer more gitlab.yml defaults to upstream

See merge request !183