Merge "Fix unpack error in test_list_servers_detailed_filter_by_image"