Merge r1003117 Fix run target problem with using classes directory instead of jar file, and remove redundant saxon dependency