[PATCH 6.1 0/5] Backport v6.2 SGID fixes to LTS 6.1