Merge change 22569 into eclair

* changes:
  Ant properties names changed