Initial support for Java config
Added JavaConfig support for generic services
Merge branch 'javaconfig'