The flow in a turbulent boundary layer upstream of a change in surface roughness