Ember: Soft-upgrade 1.6 dependencies