'Merged' URI editor dialog and Discovery dialog, also clean up related code

2018-11-08, Edouard Tisserant