Rebase on OBS 2.5.2.

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