UserAdminController changes #74477
Merge branch '74477_proxy_properties_in_geoserver.properties' into 8.5-SNAPSHOT
Merge pull request #76 from alediator/74477_proxy_properties_in_geoserver.properties_8.5-SNAPSHOT

74477 proxy properties in geoserver.properties 8.5 snapshot
Fixes for #81811 and #82025.
Merge pull request #77 from luisromangz/8.5-SNAPSHOT

Fixes for #81911 and #82025.