[S] Change in osmo-remsim[master]: Add optional timeout to mapping