drop index only if it exists (bnc#852632)
split upgrade into two files (bnc#852632)