Avoid putting jars into the classpath container that would not be retrieved to the file system.
Merge remote-tracking branch 'origin/avoid_conflicts' into bizo

* origin/avoid_conflicts:
  Avoid putting jars into the classpath container that would not be retrieved to the file system.