LPS-51026

Hi Eduardo,

I'm going to send this over to you for a review first since I'm pretty unfamiliar with the new OSGI stuff. Thanks.

/cc @juliocamarero