Fixes conflicts when picking `Resolve "gitlab 10.8 assumes that installation is a git working copy."` into `10-8-stable-patch-3`