Resolving merge conflicts in StokesBackwardFacingStepDriver and StokesCavityFlowDriver.
Merge remote-tracking branch 'origin/master'