Fix settings collision between qupgrade and qgroundcontrol

Built and ran as test