Change in ovirt-engine[master]: webadmin: merge the 2 SPM columns into 1 (#845320)