More bugfixes for AUSMT

This commit continue fixing handling of OTA. It
addresses this issue of patches that can be
partially removed.