Merge "sorcery: Add API to insert/remove a wizard to/from an object type's list"