Issue #1272840 follow-up by Dave Reid: Fixed broken upgrade path for language domains and validation.