[BUGFIX release] Don’t leak container while injection deprecated cont…

…ainer

(cherry picked from commit c68ea41)

packages/container/lib/container.js

@@ -564,31 +564,28 @@ function factoryInjectionsFor(container, fullName) {
   return factoryInjections;
 }
 
+const INJECTED_DEPRECATED_CONTAINER_DESC = {
+  configurable: true,
+  enumerable: false,
+  get() {
+    deprecate('Using the injected `container` is deprecated. Please use the `getOwner` helper instead to access the owner of this object.', false, { id: 'ember-application.injected-container', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' });
+    return this[CONTAINER_OVERRIDE];
+  },
+
+  set(value) {
+    deprecate(`Providing the \`container\` property to ${this} is deprecated. Please use \`Ember.setOwner\` or \`owner.ownerInjection()\` instead to provide an owner to the instance being created.`, false, { id: 'ember-application.injected-container', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' });
+
+    this[CONTAINER_OVERRIDE] = value;
+
+    return value;
+  }
+};
+
 // TODO - remove when Ember reaches v3.0.0
 function injectDeprecatedContainer(object, container) {
   if ('container' in object) { return; }
-  Object.defineProperty(object, 'container', {
-    configurable: true,
-    enumerable: false,
-    get() {
-      deprecate('Using the injected `container` is deprecated. Please use the `getOwner` helper instead to access the owner of this object.',
-                false,
-                { id: 'ember-application.injected-container', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' });
-      return this[CONTAINER_OVERRIDE] || container;
-    },
-
-    set(value) {
-      deprecate(
-        `Providing the \`container\` property to ${this} is deprecated. Please use \`Ember.setOwner\` or \`owner.ownerInjection()\` instead to provide an owner to the instance being created.`,
-        false,
-        { id: 'ember-application.injected-container', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' }
-      );
-
-      this[CONTAINER_OVERRIDE] = value;
-
-      return value;
-    }
-  });
+  Object.defineProperty(object, 'container', INJECTED_DEPRECATED_CONTAINER_DESC);
+  object[CONTAINER_OVERRIDE] = container;
 }
 
 function eachDestroyable(container, callback) {