packaging/ovirt-hosted-engine-setup: merge upstream commits.

update to 25852b53aae591de88aff8a26c0c0a85a4e66a0e.

Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>