Smartanswers: Marriage abroad publish and code fix

ticket: https://www.pivotaltracker.com/story/show/74837668

code fix: The fix adds back removed code in https://github.com/alphagov/smart-answers/commit/6c0357f1c62e381a485171de4b37a6dd38942567 
Due to versioning, the errors haven't been caught when running the tests in the previous pull request but only in this one after converting v2 files into v1. This happened because v1 files are tested only with the relevant v1 files, same for v2s. This will eventually clash when working on shared files, i.e. registrations_data_query.yml