make Discovery base URL configurable
add DISCOVERY_ROOT_URL for discovery configable
Merge branch 'master' into dev