Merge change 2447 into donut

* changes:
  Fix the uninstall target in the Ant build script.