diff --git a/core/includes/common.inc b/core/includes/common.inc
index 6536343..c53a1a7 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -1897,10 +1897,8 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL
 
   $context = array(
     'date_time' => $date,
-    'timestamp' => $timestamp,
     'type' => $type,
     'format' => $format,
-    'timezone' => $timezone,
     'langcode' => $langcode,
   );
   drupal_alter('format_date', $formatted_date, $context);
diff --git a/core/install.php b/core/install.php
index 6f046b2..c4cc0db 100644
--- a/core/install.php
+++ b/core/install.php
@@ -6,7 +6,7 @@
  */
 
 // Change the directory to the Drupal root.
-chdir('..');
+chdir('../..');
 
 /**
  * Defines the root directory of the Drupal installation.
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 72e01ea..8d1058d 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -3806,11 +3806,9 @@ function hook_filetransfer_info_alter(&$filetransfer_info) {
  * @param array $context
  *   An associative array containing:
  *   - date_time: The DrupalDateTime object with the date to format.
- *   - timestamp: The UNIX timestamp to format.
  *   - type: The format to use as passed to format_date().
  *   - format: If type is 'custom', a PHP date format string suitable for input
  *     to date().
- *   - timezone: The time zone as passed to format_date().
  *   - langcode: The language code as passed to format_date().
  *
  * @see format_date()
diff --git a/core/update.php b/core/update.php
index ff65c6e..cfa44df 100644
--- a/core/update.php
+++ b/core/update.php
@@ -19,7 +19,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 // Change the directory to the Drupal root.
-chdir('..');
+chdir('../..');
 
 /**
  * Defines the root directory of the Drupal installation.