Slight correction to andGroupedOr allowing it to be called on a dataset ...

...which doesn't already have a where/having clause. In this case, it will just add the ORed conditions to a new where clause

If you think it makes sense, I can also make this change to the orGroupedAnd method also, otherwise, this is ready to go, and will fix the issue with C2FO's api tests.