#968384 by Berdir: Fixed upgrade path from 6.x-1.3+ and cleaned up indexes in existing 6.x-2.x installs.