Merge branch 'hotfixe-1043' into upstream-4.0-stable
b: Fix missing -k option in chgrp
Merge branch 'hotfix-chgrp' into upstream-master