Single-schema entities.
Merge branch 'master' of github.com:granoproject/grano-reconcile