Actually, it seems like some more commits need to be backported:
* 3266c327dfa186791e0f1e2ad63c6f5d39714814 (install/devshell: Introduce git intercept script due to fakeroot issues)
* 0982977dc052ad4e65608f6853f930121d08837a (base: Drop git intercept)
* af27c81eaf68ee681dcd9456a74cca6a9ab40bf6 (scripts: Make git intercept global)
* 27de610ac30d4c81352efc794df7e9b1060f7a68 (scripts/git: Ensure we don't have circular references)
* 52c37e133fa55846aca2248ffcf3a10648dbb8d7 (base: Avoid circular references to our own scripts)
Again, all commits are contained in the current master branch.