Merge "Rename collect_logs() -> collect_netvirt_logs()"