Email error fixed.  Avast interfered.
Pre-2nd Merge. Email Confirmation servlet still giving a 404 error.