refactor a bit

- clean up comments in rule generation
- refactor is_otherproviders_dep helper function
- treat COND as AND in supplements handling
- special case OR in supplements handling so that AND functionality does not get lost
refactor testcase_str2dep

- no longer patch the string
- also support REL_AND (&) and REL_COND (IF)