refs #13006, fix deliver page d7 problem.
fixes CiviCRM Session broken anonymous cache (CRM-8765)
refs #13007, Upgrade civicrm_demo for d7