Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-01-20-54-24

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-01-20-54-24

Conflicts:
	CRM/Member/Form/Membership.php
	CRM/Upgrade/Incremental/php/FourFour.php
	api/api.php
	tools/drupal/modules/ccrm_extensionvalidation/ccrm_extensionvalidation/ccrm_extensionvalidation.module
	tools/drupal/modules/ccrm_extensionvalidation/ccrm_extensionvalidation/ccrm_extensionvalidation.version.inc
	tools/drupal/modules/civicrm_regsite/civicrm_regsite.module
	tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Form/15/Edit.tpl
	tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Form/Survey/Edit.tpl
	tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Page/Regsite/Dynamic.tpl
	tools/drupal/modules/civicrm_regsite/templates/CRM/Profile/Page/Survey/Dynamic.tpl
	tools/drupal/modules/extdir/extdir.pages.inc