needed changes to use 1.4 ifw

Change-Id: I654b9a9eafff3614232ba01055afe2d675615870
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>