KRACOEUS-6956: autowiring services.  Renaming a service with the same name as another service, moving a couple prop dev classes
KRACOEUS-6956: fixing bad autowiring
KRACOEUS-6956: fixing code style
KCINFR-979: bad rebase merge
Merge pull request #218 from leoherbie/autowire-propdev

KRACOEUS-6956: autowiring services.  Renaming a service with the same na...