Collapse DerivedTypesSchema into Schema
merge nathanlws: Collapse DerivedTypesSchema into Schema

Merge pull request #1298 from nathanlws/sql-layer/collapse-qp-schemas
https://github.com/FoundationDB/sql-layer/pull/1298