Updates to remove ehcache.xml from jar file bundle.
Modifications to rearrange jars