packaging/vdsm: fixes unsolved conflict in the last commit of this
                package.

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