Merge "Allow different explicit health and package expiry timeouts" into qt-dev am: 0a94974b67
am: 088afefcb5

Change-Id: I93fa769dd7353c451c4feb15c8b32ce72f67fa22