[NEXUS-5478] Fix XML variant of user/roles/privs resources

Previous change for this issue broke XML aliases:
<roles><role>foo</role></roles> became <roles><string>foo</string></roles>
nexus oss 2.4.0-05

Signed-off-by: Sonatype Release Machine <release@sonatype.com>
Back to version 2.4-SNAPSHOT
Merge remote-tracking branch 'origin/master' into nexus-5608-group-wl-double-update