Made orElse in Or.from(Option) to be a by-name. This was Mirco Dotta's PR, but
he made it against master and I'd like to put it into 2.2.x and pull it over to master.
Merge branch '2.2.x' of https://github.com/scalatest/scalatest