Fix #2020 "Duplicate resource names"

- also fixed a few other resources
- added duplicates check to test
revert resource.xml changes for cleaner merge
Merge branch 'master' of https://github.com/orbeon/orbeon-forms into issue507