Merge "Allow different explicit health and package expiry timeouts" into qt-dev