Move libsecret-tmp changes to libsecret branch