Merge change 22676 into eclair

* changes:
  Ant properties names legacy support