Merge 1.9.3 branch to the trunk.
Merge 1.9 changes into Head
Changes to remove ANT tokens for the turnkey install project