Fix merge with branch 'lookup-fix-for-embedded-relationships'
Fix merge with branch 'lookup-fix-for-embedded-relationships'

Flexberry/ember-flexberry,Flexberry/ember-flexberry,Flexberry/ember-flexberry,Flexberry/ember-flexberry