Query API enhancement: change default OR behavior to AND

[pilaf]

Currently calling Model.query(…).query(…) does an OR query of both query call arguments, which is the opposite of what ActiveRecord does and actually prevents composable scopes.

We need to change this behavior to AND, but keeping the ability to perform OR queries if needed.