user configuration for OSGi application bundle

Conflicts:

	akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala

Conflicts:

	akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala