Backport bzr source plugin race condition to 1.2

While the bzr plugin is not extensively used, the race condition still exists in 1.2 and should be fixed.

Most annoyingly, tests intermittently fail because of this race condition.