Backport reconnect patches

Nikola Hardirequested to merge
nhardi/jalien-root:backport-reconnect-patches into 0.5.x-patches

Add the reconnect patches to 0.5.5 release.

Merge request reports