Switch the default deployment logic to use the new generator site builder factory.
Also enabled changing between testing of the original and new generator deployment logic using environment variable so we can add a job to the ci machine for testing both.