Small changes to keep rogue_geonode up to date with the upstream geonode.