Change in ovirt-engine[master]: bll: fix incorrect merge caused from 1bc94d8c9a6