Merge of "allow nhsno to have upper case letters to match patientview"