[1.7.x] Moved index dropping after FK dropping to please MySQL and fix test