Merge "Change watchdog PackageInfo to PackageConfig" into qt-dev