Upgrade to geonode2.0.0rc1

Changes required for upgrading from geonode 2.0.0b54 to 2.0.0rc1