Merge "Add retries to more glance location tests"