Merge "Scenario manager: don't access glance_client if Glance is not available"