Fix "check-names master" and "check-names slave"

Fix "check-names master" and "check-names slave"

check for type "master" / "slave" at the same time as checking
for "primary" / "secondary" as we step through the maps.

Checking "primary" then "master" or "master" then "primary" does
not work as the synomym is not checked for to stop the search.
Similarly with "secondary" and "slave".

(cherry picked from commit a3c6516a75786c5716beb56410186ecc52057983)