Rebase to OBS 2.4.6.

Signed-off-by: Oleg Girko <oleg.girko@jolla.com>