Revision 1642024

Merge r1640730 from trunk:

 * r1640730
   Use sync Gnome Keyring API as our use of the async is not thread safe.
   Justification:
     Fix issue 3498: eclipse IDE crashes.
   Votes:
     +1: philip, markphip
     +1: rhuijben (unable to test, but fix looks sane and simplifies code)