[core:upload] fix problem of overwrite upload on DB based volume
Merge branch '2.1' into 2.1_n