Redo: issue146975 - /etc/rc.local was missing execute bit and we don't want sh -e there.
Merge branch 'master' into stian-rock2