Merge branch '5.4' of https://github.com/civicrm/civicrm-core

diff --cc CRM/Activity/Form/Activity.php
Simple merge

diff --cc CRM/Activity/Page/Tab.php
Simple merge

diff --cc CRM/Report/Form/Activity.php
index 60f18d2ad2d87e68cc78ba1314b430403b8f4701,b38b95d24d34a053fb0c592514a38d54b1dd23e0..9b55f415fa95bd1f92dfe303c2e3e7c55e732f43
--- 1/CRM/Report/Form/Activity.php
--- 2/CRM/Report/Form/Activity.php
+++ b/CRM/Report/Form/Activity.php
@@@ -893,9 -930,7 +893,10 @@@ GROUP BY civicrm_activity_id $having {$
      $activityStatus = CRM_Core_PseudoConstant::activityStatus();
      $priority = CRM_Core_PseudoConstant::get('CRM_Activity_DAO_Activity', 'priority_id');
      $viewLinks = FALSE;
 -    $context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this, FALSE, 'report');
++
 +    // Would we ever want to retrieve from the form controller??
 +    $form = $this->noController ? NULL : $this;
 +    $context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $form, FALSE, 'report');
      $actUrl = '';
  
      if (CRM_Core_Permission::check('access CiviCRM')) {