Remove from certificate of no impediment add to affirmation for marriage

Conflicts:
	lib/smart_answer/calculators/marriage_abroad_data_query_v2.rb
	lib/smart_answer_flows/marriage-abroad-v2.rb
	test/integration/smart_answer_flows/marriage_abroad_v2_test.rb