Eng 3153 schemaprep

Preparatory code for the schema change branch to make the reviews smaller. Mostly test support and minor changes to some product code. A few typos fixed. Does not change product functionality.

Running in Jenkins now.