Merge "Prevent using commas in url configurations" into rvc-dev am: 6ccbe373e6 am: efddbd1db6

Change-Id: I06068c7e76ad78244831a1ab715987a950af270a