Enhance a few patterns and avoid leaks in some code

[fpapon]

@rmannibucau the repo move to Apache here: https://github.com/apache/karaf-minho/ @jbonofre it will be better to update this current repo to readonly to avoid confusion?

[jbonofre]

Actually I will delete this repo to avoid confusion. I can apply Romain's changes directly on the Apache repo.