Merge "Add a delimiter between scheme and host" into jb-mr2-dev