[merge] revert option help / global option tests (was Re: test_shelve broken in bzr.dev (2613))

[Aaron Bentley]

Aaron Bentley has voted +1.
Status is now: Semi-approved
Comment:
We can migrate the options using the standard deprecation approach as a 
follow-on.  If we like.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Ce01316480707122145y282f276fu583b2d076c353a20%40mail.gmail.com%3E