duplicate auth-url option returned by BaseGenericPlugin

The free function get_options() should only return the options that
the object itself needs.

Change-Id: Id54f353d8b125807a8fc33b4bca8854605e3febb
Closes-Bug: #1388954
Add missing user-id option to generic.Password

The user_id field is available when constructing the plugin from python
however the option is not listed in the get_options list.

Change-Id: I036c4a49f58e4412c6cfb477b56b31b7b965c2fb
Merge "duplicate auth-url option returned by BaseGenericPlugin"
Merge "Add missing user-id option to generic.Password"