Updated config
Merge branch 'master' of ssh://source.dexels.com/~openshift/data/karaf into stable

Conflicts:
	apache-karaf-2.3.0/etc/navajo.server.http.osgi.cfg