EE version of gitlab-ce!16071 patch. Part of this EE version is also removing rebase bits from 'ee/'.