Cherry-pick of 'aws fix root group addition' into release/0.26
Original MR: !684 (merged)
Merges a fix for an overwriting users.data.root
parent groups.
Edited by David Diederich
Original MR: !684 (merged)
Merges a fix for an overwriting users.data.root
parent groups.