Merge branch 'master' of https://github.com/rollox/civicrm-core into CRM-18317

Conflicts:
	CRM/Utils/System/Drupal.php

----------------------------------------
* CRM-18317: Links to Drupal system broken if hook altered by a module
  https://issues.civicrm.org/jira/browse/CRM-18317

diff --cc CRM/Admin/Page/Access.php
Simple merge

diff --cc CRM/Utils/System/Drupal.php
index 5076a72cf2f84aef38faffd6866ccdf4e2838d8f,3b214841b9da6742cb782c980faba40633efeae7..8beb99405cd36012fe2d7d8bea3267a0c0b83c14
--- 1/CRM/Utils/System/Drupal.php
--- 2/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@@ -149,8 -149,8 +149,8 @@@ class CRM_Utils_System_Drupal extends C
            array(':mail' => $params['mail'])
          )->fetchField();
          if ((bool) $uid) {
-           $resetUrl = $config->userFrameworkBaseURL . 'user/password';
+           $resetUrl = url('user/password');
 -          $errors[$emailName] = ts('The email address %1 is already registered. <a href="%2">Have you forgotten your password?</a>',
 +          $errors[$emailName] = ts('The email address %1 already has an account associated with it. <a href="%2">Have you forgotten your password?</a>',
              array(1 => $params['mail'], 2 => $resetUrl)
            );
          }

diff --cc CRM/Utils/System/DrupalBase.php
Simple merge