Various fixes to support upgrades to ember-runtime v.1.7.0+