Discovery config screen problems in latest code

When we updated the discovery UI with changes to support the new Camel-based discovery, we introduced some issues:

• Location needs to be an optional field with a dropdown for possible values.
• Some fields show up as "null" because we're not checking the String value properly before filling in the value.
• "Retries" is duplicated.