Merge pull request #2752 from ember-cli/nvp/update-parser-2

Merge pull request #2752 from ember-cli/nvp/update-parser-2 #1095