Changed the timing on two intermittently failing Condition specs.
Merge branch 'master' into experimental-cruby-do-not-merge