Squashed commit of the following:

commit e0c332cdc2fc3c5531873a220449c919a13b3be3
Author: Seangchan Ryu <sryu@fnal.gov>
Date:   Tue Jan 14 14:53:03 2014 -0600

    dbs3 datastucture fix

commit d8dea4fd59d72f10864786f3f404204bbb05a0f4
Author: Seangchan Ryu <sryu@fnal.gov>
Date:   Tue Jan 14 00:28:05 2014 -0600

    when dbs upload timeout happens, retry one more time.
Merge pull request #4909 from ticoann/dbs3_datastruct_fix

fixes dbs3 timeout issue and dbs3 datastructure issue when it fails