Fix class path and jar inclusion order in build.xml
Merge branch 'master' into hack/with-binary-libraries

* master:
  Fix class path and jar inclusion order in build.xml