Small fixes
Merge branch 'master' of github.com:reta/jax-rs-2.0-cdi