Merge "Adjust audit to use device_id to find nova server"