bug #1966: Fix for wrong CDROM removing
(cherry picked from commit 618077853910c18dc049f5d13a133e7b5579ebc6)