introduce internal geoserver URL, refs#579
Merge branch 'iss-579'