Merge pull request #134 from jkangas/master

Request for pulling new mainstream ofono and mnc plugin to main branch
[provision] Fix merge error

Signed-off-by: Martti Piirainen <martti.piirainen@oss.tieto.com>
Merge pull request #135 from marttipiirainen/mergefix

[provision] Fix merge error
Revert "[rilmodem] Make LTE configuration forcing working both ways"

This reverts commit 7d8c819d6b2d11acab365a0b9a1eb8f1c586adb7.