Merge "Factorize ignoreValidationAfterRoam tests"