Change in ovirt-log-collector[master]: sos: fixing backport issues