Merge: rev755 (Remove TEST_DSN setting that was being incorrectly set during ./tarmac_tests)