Merge "Drop left over SQL indexes that prevent removal of sortkey"