Intro. @Inject @Singleton etc. in some helper services, for testability

Intro. @Inject @Singleton etc. in some helper services, for testability

This should not have any impact to real runtime code, and is hopefully
low risk. In particular, this alone does *NOT* yet actually exploit
these annotations for auto. generating blueprint XML (because I'm not
activating the blueprint-maven-plugin here, yet).

But adding these is useful already, because it allows these helper
services to be easily used in dependency injection via Guice in
Component Tests.

These annotation can however, later also be used by the
blueprint-maven-plugin - once the respective projects fully switch.

This change also includes a bunch of otherwise completely unrelated
automated formatting and code clean-up which happened automatically as I
was touching these files.

Change-Id: If1c3fe6d03f089bbeee0453742fe5cea8f4f098d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>