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

[Vincent Ladeuil]

>>>>> "jam" == John Arbash Meinel <john at arbash-meinel.com> writes:

<snip/>

    jam> BB:approve

Thanks.

    jam> Again, Bob Tanner has the final signoff on all 1.14 related things.

Sure, I'm waiting for its approval before merging to 1.14.

Bob, if you want to merge it yourself, the branch is available at
lp:~vila/bzr/355273-osx-failures.

        Vincent