Reverted to Blueprint for CXF and SCR-only for OSGi services.

Signed-off-by: Paulo Pires <pjpires@gmail.com>