Index: ejb/ejb-container/osgi.bundle
===================================================================
--- ejb/ejb-container/osgi.bundle	(revision 49272)
+++ ejb/ejb-container/osgi.bundle	(working copy)
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -48,8 +48,6 @@
                         com.sun.ejb.spi.container; \
                         com.sun.appserv.ejb; version=${project.osgi.version}
 
-# See issue #10545 to know why we have explicitly added org.glassfish.apf.context
-# in Import-Package
 # Note that the CORBA and javax classes are needed so that dynamic RMI-IIOP
 # can create a stub for ReadOnlyEJBHome.
 Import-Package: \
@@ -67,7 +65,6 @@
                         org.omg.CORBA_2_3.portable;resolution:=optional, \
                         javax.rmi.CORBA;resolution:=optional, \
                         com.sun.corba.ee.impl.presentation.rmi.codegen;resolution:=optional, \
-                        org.glassfish.apf.context, \
                         *
 
 Bundle-SymbolicName: \
Index: ejb/ejb-connector/osgi.bundle
===================================================================
--- ejb/ejb-connector/osgi.bundle	(revision 49272)
+++ ejb/ejb-connector/osgi.bundle	(working copy)
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -39,3 +39,9 @@
 #
 
 -exportcontents: org.glassfish.ejb; version=${project.osgi.version}
+
+# See issue #10545 to know why we have explicitly added org.glassfish.apf.context
+# in Import-Package
+Import-Package: \
+			org.glassfish.apf.context, \
+                        *