Return serverUrl to original semantics - override of webapp url
Updated
merge
Merge branch 'dev' into release