Fold create_discovery into update_discovery. Also, ensure that, in the event of a save failure, the user is re-presented the edit form with their unsaved data.
Fold create_discovery into update_discovery. Also, ensure that, in the event of a save failure, the user is re-presented the edit form with their unsaved data.

gsiems/pTracker,gsiems/pTracker,gsiems/pTracker,gsiems/pTracker,gsiems/pTracker