KeyError would be raised during ZODB serialization; catch that. Not sure if this is the best solution or not but it gets zope.container passing.
Resolve merge conflict.
Wrap long line.
Changelog for PR #6.