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