Locations of directories for ant tests were fixed.
Merge remote-tracking branch 'origin/develop' into develop