Use a barrier to make 180s more reliable
Merge pull request #77 from Metaswitch/robust_180s

[Reviewer: Andy] Use a barrier to make 180s more reliable