mk-drupal-test-site - When writing out setup.conf, include CIVISOURCEDIR

mk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and the new CIVISOURCEDIR