Revert "Merge branch 'master' of github.com:ops4j/org.ops4j.pax.cdi"

This reverts commit af8dca0877bf14cdef342d5341c48e28c4264097, reversing
changes made to a6f886d44787e1a79bc36b40b26a5ab4c843dacc.
Update README.md
Merge branch 'fixmerge'
Merge branch 'master' into fixmerge
formatting