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.
@antoviaque xblock-discussion refers this file in a few places. It is not referred to anywhere within edx-platform, however.

I'll keep the commit that modifies it.