mk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and the new CIVISOURCEDIR
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