Updated analytics tagging to match new url structure

Conflicts:
	src/SFA.Apprenticeships.Web.Candidate/Views/Shared/EditorTemplates/AddressViewModel.cshtml
	src/SFA.Apprenticeships.Web.Candidate/Views/VacancySearch/_Apply.cshtml