ENG-7202: Try to reconcile the two copies of fullDDL.sql.  There's

still some sadness, and adding alter/drop is going to introduce more
sadness, which is why I didn't merge them completely.