server: remove duplicate ehcache.xml

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge branch 'master' of github.com:killbill/killbill
Merge branch 'master' of github.com:killbill/killbill
osgi: cleanup OSGI dependencies, pass 2

Don't use relocated org.osgi Felix artifacts as these
are incompatible with the latest Felix framework.

This is a partial revert of 6c757156e5518dc92c39e338bc3bbb5ea55154bd.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge branch 'master' of github.com:killbill/killbill