combined bug fix for f13371e9bb04c9bed1da4bb8b896ff82450adf50
combined bug fix for f13371e9bb04c9bed1da4bb8b896ff82450adf50

live4thee/zstack-utility,zstackio/zstack-utility,live4thee/zstack-utility,zstackorg/zstack-utility,mingjian2049/zstack-utility,live4thee/zstack-utility,zstackio/zstack-utility,mrwangxc/zstack-utility,zstackio/zstack-utility,mingjian2049/zstack-utility,mrwangxc/zstack-utility,zstackorg/zstack-utility,mrwangxc/zstack-utility,mingjian2049/zstack-utility,zstackorg/zstack-utility