KRACOEUS-7344: converting to DOS to help troubleshoot test for s2s gener...

...ator
I actually like the PredicateFactory format best as it is more concise than the map based format.  Also, even if we converted to the map based format, we would still need to use the PredicateFactory in some cases since the map based format only support and equals expressions.  I guess it's just aesthetics either way whether you like:

```
final Map<String,Object> paramMap = new HashMap<String,Object>();
paramMap.put("budgetId", budgetId);
paramMap.put("namespace", namespace);
```
or

```
and(equal("budgetId", budgetId),
   equal("namespace", namespace))
```