misc: final cleanup for opensuse and debian

Change-Id: I07cf920ed99f460bffe1d8a16f3444706f4572c3
5 files changed