Master cylinder and power brake booster replacement

This is a wagon, in great condition, carefully maintained from new. Recently, there was a lot of travel, in the brake pedal and the Ford shop replaced the master cylinder. There was no change. I went to a new shop who obtained a tech bulletin from Ford regarding revised brake master cylinder and brake booster for this car. Article No. 98-5A-15, 3 pages with diagrams. We now have to order the correct combination of both parts. Can you advise what number parts these should be. So, it is for a wagon, automatic, pre 1994. Is it two, separate parts and numbers, or are they combined? It is a bit confusing. It looks like the two pRt numbers on the first page of the article left hand column under automatic. "38" is stamped on the MC casing. AutoZone tell me they can get the parts.