A few more tweaks to build.xml required to get 2.11.0-RC3 to *deploy*.