Integrate refactored load trait, merged with deprecated download trait. Update unit tests.
Authored by: briggs@adobe.com 2009-12-16
Parent: [r651]
Child: [r653]