Obvious boolean logic fix. Should be boolean AND, not boolean OR
Merge pull request #662 from tdonohue/DS-2097

DS-2097: Obvious boolean logic fix. Should be boolean AND, not boolean OR