Change in ovirt-engine[master]: core: Fix sorting and whitespace errors