Merged test-failures-updated-bzrlib-possibly [a=allenap] [r=jkakar]
Be more forgiving of test output that may vary as a result of changes
in dependencies. The ordering of the standard --quiet and --verbose
flags, for example, seems to have changed, possibly as a result of
changes in bzrlib. This detail is irrelevant in the tests, however,
so testtools.matchers.DocTestMatches is used to test output with more
flexibility.