Merge tag 'geoserverxml' into develop

GeoServer XML
Add roles to users
Merge branch 'release/rolestousers'