Merge pull request #14455 from civicrm/5.14

5.14 to master

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Contribute/Form/CancelSubscription.php
Simple merge

diff --cc CRM/Contribute/Form/ContributionRecur.php
index 20aa64f1725f31f199ec74d1de6e668e420a5c0f,d37db2c0a35065a28703bfa1b15952f937e327c5..f5b26ce4e75a80700cc9fa56d4a8610266fbf2de
--- 1/CRM/Contribute/Form/ContributionRecur.php
--- 2/CRM/Contribute/Form/ContributionRecur.php
+++ b/CRM/Contribute/Form/ContributionRecur.php
@@@ -114,17 -114,10 +121,19 @@@ class CRM_Contribute_Form_ContributionR
      return 'create';
    }
  
 +  /**
 +   * Get the entity id being edited.
 +   *
 +   * @return int|null
 +   */
 +  public function getEntityId() {
 +    return $this->contributionRecurID;
 +  }
 +
    /**
     * Set variables up before form is built.
+    *
+    * @throws \CRM_Core_Exception
     */
    public function preProcess() {
      $this->setAction(CRM_Core_Action::UPDATE);

diff --cc CRM/Event/Form/Registration/Confirm.php
Simple merge

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

diff --cc contributor-key.yml
Simple merge

diff --cc release-notes.md
Simple merge