Since enrichWithBeanProperty() is moved from JsonSchema to SimpleTypeSchema, the parameter type needed to change.  All other type changes from JsonSchema to SimpleTypeSchema in this changeset decend from this change.