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.
Same remark about whether this is a problem upstream - if not we should find out why we have to do this.