Integrating the changes from the new geonode-project template