Replace all occurrences of 'or' with '||' to work with OCaml 4.01.0
Merge pull request #1504 from akshayramani/CP-5715

CP-5715: Replace all occurrences of 'or' with '||' to work with OCaml 4.01.0