[MERGE][1.14][355273] Fix OSX test failures

[Vincent Ladeuil]

<snip/>

    vila> I will check with previous versions of bzr as it seems that my
    vila> setup has hidden some bugs here for some time...

Failures confirmed with 1.13 :-/ And even some for 1.6 (still running).

So I think we want to file another bug at that point (may be
several even...) to make it easier to track the problems (I
suspect several are present here) and not mess up with 1.14
release as these issues are not new.

  Vincent