Patch for https://ortussolutions.atlassian.net/browse/CCM-8

Prevent dynamic findBy methods from stripping "and" and "or" from valid property names