Added options to enums OldEthnicityType and GradeLevelType

Added “Middle School” and “Elementary School” to GradeLevelType
Added “Two Or More Races” to OldEthnicityType
Merge branch 'master' into ds-1099
Merge branch 'master' into DS-1291
Remove unused stepdefs