Refactor acl.check_ownership to prevent imports of Addon and Collection models (bug 858287)