Apple Mac OS X Keychain support (3/3)

 - final fixes, after getting access to a physical Apple machine
 - functional/integration testing to follow, hopefully will result in
no more commits