sos: fixing backport issues

fixing some bits left while backporting from sos 3.

Change-Id: I2ec54434502a6774da8f2bdf7e87d76df89a4fed
Bug-Url: https://bugzilla.redhat.com/1129373
Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
(cherry picked from commit d0edf00b9e5bd40509e5a1a851fb556857a48d50)