Convert User resources to new Schema format

blueprint property-schema-conversion

Change-Id: I1244d14db2aad93373bfa4a1749cda46fa14980e
Convert resources to new Schema format

blueprint property-schema-conversion

Change-Id: I06df691f452c9abf6d846aa32a3e2a409aebc27d
Merge "Convert User resources to new Schema format"
Merge "Convert resources to new Schema format"