Fix rejecting inflights attrs

Fixes #2485 
Need to make the shim for Ember.merge nicer.
@fivetanley