I cleared data on the first Software update app, and then force stop [clear cache was not available].
Clear data and force stop was not available on the second Software update app, so I just cleared cache, and restarted the phone.
As before, it started by updating firmware and at the end I got a message saying "Android update successful", but then, in the notifications I get a message from OMADM saying " Firmware update not completed", i.e. same as before.
I went through the same [clear cache, clear data, force stop for the first Software update app, only clear cache for the second - the other 2 options were not available], without restarting the phone ... will let you know if it starts to update again.