Code fixing
Fixing imports properly
Docs improved
Fixing typo
Missing annotation
Merge pull request #422 from garcia-jj/ot-cdi-codecleaning

Some minor fixes under container/cdi package