This is an inplace config migration.  The mount still behaves
the same way and a config save from the page migrates the
options.  We're not in a rush here, but the reason is that
we should have clean options and the new 17.1 images for nano
will depend on the new style.

(cherry picked from commit e413994c)
(cherry picked from commit 3d802a0a)
(cherry picked from commit 393fadce)