fix for #ERRAI-616 now reads less files from jars
Merge branch '2.4' into develop