(PUP-1447) Added unless_uid option to User Resource management.
(PUP-1447) Merge branch 'feature/master/PUP-1447-unless_uid_option_resource'