Fixup a few sanity issues on custom forms

  * Require a label on form fields
  * Require variable name to be unique per form
  * Fixup duplicate phone numbers on upgrade