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.
For these DB caches, it makes sense to update them just in our fork, as we don't have the same DB schema overall. They should however be isolated in a commit clearly labelled for the next rebase, to know that we'll need to update this again then. All good here.