mk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and the new CIVISOURCEDIR
Merge pull request #1816 from pradpnayak/CRM-13446

CRM-13446
Merge pull request #1807 from totten/4.3-mk-drupal-test-site-setup-conf

mk-drupal-test-site - When writing out setup.conf, include CIVISOURCEDIR
-- CRM-13446, fixed upgrade if current version is less then 4.3

----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
  http://issues.civicrm.org/jira/browse/CRM-13446