Switching from jcl to slf4j
Mocking jcl with jcl-over-slf4j in jci module
Some cleanup