Fix paste config option conversion for auth options

When the auth plugin was added, the options were removed from the
options that get included in the option conversion routine, which
causes option conversion to fail for those options.

Change-Id: Ia1afaad339881800799742bd171b44c531ffe217
Merge "Fix paste config option conversion for auth options"