Revert "Merge branch '29063' into 'master'"
Revert "Merge branch '29063' into 'master'"

This reverts merge request !4135
zstackio/zstack-utility,zstackio/zstack-utility,zstackorg/zstack-utility,zstackorg/zstack-utility,zstackio/zstack-utility,zstackorg/zstack-utility