Acceptance rebase 20140926

These changes patch up some underlying bugs revealed from the rebase, and the tests appear to all be fine, though some of them have to run in isolation, possibly pointing to a problem with the webdriver.
The reason I updated these in our repo is because they were present previously. They're also present upstream.

I find the fact that these files are being version tracked very unpalatable, as I think they should be treated as what they are: caches.

I'm of the opinion that they should be deleted and a .gitignore should be placed in these directories. They are, after all, generated the first time the tests are run. I'm willing to make an upstream PR for this.

I have a feeling the reason why these are here is because the testing servers rely on them to cut down on run time. But that's speculation on my part.