Also added some 5-second timeouts in various places to build.xml because (expected) exceptions were causing ant to hang for a long time, then inexplicably continue.
