Do not consume trailing semicolon as part of URL

Change-Id: Id642d4ff77a982d5f31dc80303dcf616030eaaa8
Merge "Do not consume trailing semicolon as part of URL"