Revert "Merge branch 'shixin-ZSTAC-45924' into 'master'"
Revert "Merge branch 'shixin-ZSTAC-45924' into 'master'"

This reverts merge request !1689
zstackio/zstack-utility,zstackio/zstack-utility,zstackio/zstack-utility