Reverts the default user/group from
I4a90479261b2721c08e9034fbae0d56de9308676
Adds global default options so user/group etc can
be overridden on the setup host
Some cases of 'omit' for file modes are changed to a
role-defined default which will override any system umask
preferences.
Related-Bug: #2029253
Change-Id: Id999ccf5f42ee7f6b6b08db67276bb77bc9a21d8