Allow root entity key attribute definitions in nested single entities,
improve validation messages
Merge branch 'master' of https://github.com/openforis/collect