Revert "Merge branch 'shixin-14537' into 'master'"
Revert "Merge branch 'shixin-14537' into 'master'"

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