[OFONO] update to latest master by hand

Signed-off-by: Jarko Poutiainen <Jarko.Poutiainen@oss.tieto.com>