[5.4.10] cherry-pick ZSTAC 5.x storage fixes#4355

MatheMatrix wants to merge 3 commits into

5.4.10MatheMatrix/zstack:5.4.10from

sync/shan.wu/backport/5.4.10/ZSTAC-86342-batch@@3MatheMatrix/zstack:sync/shan.wu/backport/5.4.10/ZSTAC-86342-batch@@3Copy head branch name to clipboard