cosmetic: use **kwargs instead of **_kwargsSome methods sometimes have a **_kwargs parameter, let's be consistentand use **kwargs only.Related: OS#5714Change-Id: I98857cc774185e55a604eb4fbfbf62ed4bd6ded7