Catch-up merge from master sources @186481 to branch/2014-04-15/mvffnoseg.
Rename MVTFailover to MVTFreeLand, as suggested by RB in review.