Preparation for SRB Gerrit review

Please use this PR for review, or the branch to push any changes.

We'll squash any commits later on into 2 target commits.
Are you talking about the retry decorator ? I had in mind the possibility to export it into some looputils (I think that's the name) of cinder.