Merge "OSM_HOSTNAME set to 127.0.0.1 instead of localhost to fix issues detected in some environments"