Merge branch 'hotfix-chgrp' into upstream-4.0-stable
b: Fix missing errors on some FMS commands (head, tail, rm)
Merge branch 'bugfix_rm' into upstream-master