refs #32833
Merge remote-tracking branch 'origin/bugfix/gpdb-sql-index2'

Conflicts:
	sql/mysql/7030to7040.sql
	sql/postgres/7030to7040.sql