Marriage abroad V2 updates

Updates to fix problem with some countries not having an outcome for
marriage
Merge branch 'master' into marriage-abroad-v2
Merge pull request #279 from alphagov/marriage-abroad-v2

Marriage abroad V2 updates