[#1010] Consistently use survey and form domain language
Merge pull request #1014 from akvo/feature/1010-domain-language

[#1010] Consistently use survey and form domain language