Replace keywords `and` and `or` where they don't change semantics, using rubocop:Style/AndOr

Replace the simplest category of rubocop Style/AndOr violations: where `and` and `or` keywords have been used instead of `||` and `or`, such that they can be replaced without change in semantics.