Adding fixes from upstream repos + new versions of Ember/Ember data.