SFR 451583 Attempt to fix deadlock.
Merge branch 'master' of github.com:Metaswitch/fmj