tweak locators to work for both 5.1 and 5.2

tests/test_logout.py and tests/test_infrastructure_hosts.py will check this out if you want to run against a 5.1 & 5.2  box (which is how I verified)