6.0-BETA4 changes numbering of atapicam devices

Hi,

I have a system with 2 CD/DVD devices on the same ATA channel. For
years, with RELENG-4, RELENG_5 and up to 6.0-BETA3, atapicam showed
the (intuitive) mapping:

acd0 -> cd0
acd1 -> cd1

With 6.0-BETA4, it is no more true:

acd0: DVDROM <SAMSUNG DVD-ROM SD-616T/F310> at ata1-master UDMA33
acd1: CDRW <HL-DT-ST GCE-8481B/C102> at ata1-slave UDMA33
Trying to mount root from ufs:/dev/ad0s3a
cd0 at ata1 bus 0 target 1 lun 0
cd0: <HL-DT-ST CD-RW GCE-8481B C102> Removable CD-ROM SCSI-0 device
cd0: 33.000MB/s transfers
cd0: Attempt to query device size failed: NOT READY, Medium not present
- tray closed
cd1 at ata1 bus 0 target 0 lun 0
cd1: <SAMSUNG DVD-ROM SD-616T F310> Removable CD-ROM SCSI-0 device
cd1: 33.000MB/s transfers
cd1: Attempt to query device size failed: NOT READY, Medium not present

Not critical, but annoying

Thanks,

Claude Buisson