start fixing for jj-abrams branch of ember data