902869 - more robust handling of --force unregistration.

https://bugzilla.redhat.com/show_bug.cgi?id=902869