Combine marketing site tests into a single file

When they were in 2 files, each execution would kick off two separate jobs at sauce labs, which each had to start up a new ssh tunnel, etc.

@wedaly