Unify Add Storage dialog

Storage tab and Plugins tab had subtly different versions of the Add
Storage dialog, should be unified.

ticket:	#2401
Merge:	releng/9.1.0
(cherry picked from commit 98890bc65b68fff1b4f2ffbf4f9464a2288ded47)