Merge branch 'v1.1.x' into no-root-user

bringing branch up to date with changes in the originating branch

Conflicts:  scripts/etc/init.d/rcS