Trivial cleanups.
*Â bzrlib/tests/test_shelf.py:Â
Fix imports.
*Â bzrlib/tests/test_osutils.py:Â
Fix imports.
*Â bzrlib/tests/test_dirstate.py:Â
Fix imports.
*Â bzrlib/tests/test_bundle.py:Â
Fix imports.
*Â bzrlib/merge_directive.py:
(MergeDirectiveFormatRegistry): Add Aaron explanation for the
double registration.
*Â bzrlib/hashcache.py:
Fix imports.