Fixes rlock in container.resolve() to actually provide safety
Merge branch 'threads'