There were a couple with the theme. Another was going against the east Germans.
Sgt.Shultz was in that episode.
Col. Klink was also in a couple of episodes.
I looked up an online gallery devoted to Perry Mason guest stars. A young Uncle Jesse (Denver Pyle without his beard) was in one episode. Among others are Bert Convy, Barbara Eden, and a host of Star Trek TOS actors (Barry Atwater, William Campbell, Kathie Browne, DeForest Kelley, Elisha Cook, Madlyn Rhue). Big treasure trove of actors including also Burt Reynolds and Robert Redford in their younger days, lol.
And indeed both Klink and Schultz were on this show.
Link: http://www.perrymasontvseries.com/database/picture5.php