Fix build process.

Since the merge of 6.1 build changes did not work, reverted back to original build files, copied in the svn artifacts that were blocking deployment, and altered the build files to pick up those artifacts from the resources tree instead of svn.

Also reduced the retry wait periods in download manager, to foster faster recoveries.