This is a cherry-pick of commit 8bd17a4b0cd9c1432cb57a9a80a215692f532370 in 3drobotics/PX4Firmware-solo Conflicts: src/drivers/batt_smbus/batt_smbus.cpp src/drivers/drv_irlock.h src/lib/ecl