Support options namespaced as either httptest or httptest2

[nealrichardson]

Same for package redactors in inst/httptest. Add helper functions that check httptest2.something first, then check httptest.something.