https://bugzilla.redhat.com/show_bug.cgi?id=1014037 and https://bugzilla.redhat.com/show_bug.cgi?id=1009409 - fix bridge shutdown while failing
Merge pull request #1720 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=1014037 and https://bugzilla.redhat.com/show_bug.cgi?id=1009409