Merge pull request #628 from emilianbold/release90

Cherry-pick Ant 1.0.4 commits for release90