Issue #2167611 by nod_: Back to site button broken.
Issue #2167517 by mtift, ianthomas_uk: System_custom_theme calls removed function drupal_container.
Merge remote-tracking branch 'origin/8.x' into entity-uri-templates-2150747