Merge "Ensure the rpi kernel includes the ethernet driver by default" into guppy