Fix xml formatting.
Fix import and formatting of unit test
Upgrade geoserver-manager and restitio dependencies