Small fix removed group and user creation as it's using root by now.
Merge remote-tracking branch 'origin/master'