Add testQueryOr2DoubleArrayExample() test
Change _addCondQuery() to use array_merge instead of Set::merge

This fixes the pattern of using array(array( 'OR' => array( .. in
queries