Small fix on instrument import from setup data due to merge conflicts
Small fix on instrument import from setup data due to merge conflicts

labsanmartin/Bika-LIMS,rockfruit/bika.lims,rockfruit/bika.lims,DeBortoliWines/Bika-LIMS,anneline/Bika-LIMS,anneline/Bika-LIMS,DeBortoliWines/Bika-LIMS,veroc/Bika-LIMS,labsanmartin/Bika-LIMS,anneline/Bika-LIMS,veroc/Bika-LIMS,DeBortoliWines/Bika-LIMS,veroc/Bika-LIMS,labsanmartin/Bika-LIMS