On grid-independence of RANS predictions for aerodynamic flows using model-consistent universal wall-functions