china is now an OS affirmation country

removing code and text relating to CNI route
Adding additional changes for china
Merge pull request #1068 from alphagov/marriage_abroad_china_changes

Updates to Marriage abroad smart-answer