Merge osdetect and addonsdetect