MDL-22366 upgrade - always drop DB objects conditionally