ODE-984. OSGi fixes

git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@1436040 13f79535-47bb-0310-9956-ffa450edef68