Upstream 2.0.x

This updates our Geonode with the latest 2.0.x version from upstream.