build: sync with ovirt-engine build

Change-Id: Ie89b465f0bb96a42c3b397b2b2bb92fbda0a7fd6
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>