Feature/osgi bundle

Fix USM in order to work with OrbisGIS 4 beta 2