More nuanced merging of project defaults.
Merge pull request #1341 from llasram/meta-merge-defaults

More nuanced merging of project defaults.