Revision 1642023

Merge the r1386594 group from trunk:

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