Merge "[so][msb] Update MSB url to match with its certificate" into frankfurt