Merge tests from 1.0.x

So, this looks worse than it is (via the commit count).  For everything other than files under spec/acceptance I simply checked out the code from 1.1.x, but I didn't know a better way to get all the work we did for 1.0.x tests into 1.1.x.

And this is why we shouldn't have divergent branches under parallel development...