CRM-12351 fix backport to be multi-lingual friendly
CRM-14399 add alterCalculatedMembershipStatus hook

Conflicts:
	CRM/Member/BAO/Membership.php
	CRM/Member/Import/Parser/Membership.php
	api/v3/MembershipStatus.php
CRM-14396 - add module extension support to handlePaymentNotification
CRM-14108 add scheduled reminder id as a params on scheduled job

----------------------------------------
* CRM-14108: Add Param for id to scheduled reminders
  http://issues.civicrm.org/jira/browse/CRM-14108

Conflicts:

	api/v3/Job.php
remove 'is-active' default from scheduled job
duplicate MessageTemplate.php in order to allow functions to call either for upgrade support
customFileUploadDir - Restrict remote access

Conflicts:
	CRM/Utils/Check/Security.php
add drupal folder to d7 version

drupal updates from 4.2.2

4.2.4 drupal upgrade changes

4.2.7 drupal folder updates
Add mysql timezone support
CRM-11543 - Fix Drupal 7 rules module so that permission to view admin form is available

CRM-11544 - Drupal Rules 7 - incorrect permissions checks
change views hook to use alter
Confirmed CRM-11017 fix relationship filter
fixes to walklist (in 4.3)
CRM-11838 ETA 4.3 Force civicrm_member_roles to reload user object before saving (CRM-11838).
CRM-12009 Fix views filtering on tag name, group title.
CRM-12207 Set preferred_communications_method to use pseudoconstant handler.
CRM-11908 ET 4.3 OG sync stuff d7 / OG2

CiviCRM OG Sync doesn't support the currently recommended release of
Organic Groups for D7
Join civicrm_contact to civicrm_uf_match table for views (CRM-12836).
CRM-13081 Allow joining to the civicrm_relationship table via either contact_id_a or contact_id_b.
CRM-12593. 'CiviCRM Contacts: Drupal ID' fails for chained relationships.