Fix notice introduce in previous commit

Plus simplified the logic around "generated" primary key fields — no longer depends on index="pk" being set on the schema
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Fix notice introduce in previous commit
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Fix notice introduce in previous commit