Merge change 23420 into eclair

* changes:
  ADT: change continuous test ant script to run both functional and unit tests.