SWC-1863, SWC-1866
move url parsing to the server to utilize java
move to the server
Merge pull request #1289 from jay-hodgson/release-66

SWC-1863, SWC-1866
Merge pull request #1291 from jay-hodgson/develop

merge from release-66