FS-7593 --resolve add locking keyed on device name around any database updates adding/removing the device