Handle the project/tenant nonesense more cleanly

devstack clouds are more strict that public ones, so it's more important
to get project_name vs. project_id correct. Solve it with brute force.

Change-Id: I957b19c23266d379834361ab6a5b3b2dc5d15d3d