Fixes syntax errors in resource definition files.
Merge branch 'syntax-fixes' into merged-fixes