Fix class path and jar inclusion order in build.xml
Merge branch 'master' into refactor/builder-aware-lang

* master:
  Fix class path and jar inclusion order in build.xml
Move invocation and result processing of builders to the Builder class