Bug 25654: Make the contact and non-patron guarantor sections separate on patron...