Conflicts:
cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.