Merge "Bring in the files from base scenario into os-nosdn-osm"