Make Berkshelf threadsafe (again)