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.
There must be no space around comma in the comma-separated list base_urls. I suggest usage of strip() and maybe you should validate the url.