Reduce ALTER TABLE calls by adding/dropping multiple columns at once

Fixes I#21309.
Merge branch '4.2/fewer-alter-table' into 4.2-trunk