Update to support schema defined in the changeSet as well as schema
defined in the defaultSchemaName property.

Change-Id: Idf37acbd2a3ea81998dd05f8dda162f752c83a67