Merged bootstrap-tests.inc.php into bootstrap-tests.php

Originally this was separated out for a specific reason, so that developers could rename the file for their local settings. Now phpunit.xml handles that and passes in the values via environment varialbes so the old method can be retired.