Add disjunctive multi-constraints with |, refs #643, fixes #1342
Update changelog
Add missings bits and pieces to cli docs
Merge branch 'disjunctive'