Cleanup is more careful in timed holster drill and extra lock in ISSF to close #80