Merge "passpoint-r2: change the name for OSU_FAILURE_INVALID_SERVER_URL."