BAMPFA-256: upgrades to underlying cspace_django_site code. should be cherrypicked someday