Bug[1218981]: Fix storage node ring sync export conflicts

Merge this pull only after pull 30:

This pull request addresses launchpad bug 1218981 upstream bug 1224592. A patch has been submitted to upstream master but will not be back ported to grizzly because it breaks backwards compatibility.