Cannot set per protocol remote_id_attribute

Fix proposed to branch: master
Review: https://review.openstack.org/171889

needs to be backported to kilo stream

Reviewed: https://review.openstack.org/171889
Committed: https://git.openstack.org/cgit/openstack/keystone/commit/?id=9b11d13856034e3a2cf6ab1f6ca80a6965818d17
Submitter: Jenkins
Branch: master

commit 9b11d13856034e3a2cf6ab1f6ca80a6965818d17
Author: lin-hua-cheng <email address hidden>
Date: Wed Apr 8 17:03:23 2015 -0700

    WebSSO should use remote_id_attribute by protocol

    WebSSO always use the remote_id_attribute from the
    [federation] group. Fix the issue, by consuming the
    protocol specific remote_id_attribute if available.

    Change-Id: Icdc693965ec53e5ff8f1901af26c9232a20aef7e
    Closes-Bug: #1441827

Fix proposed to branch: proposed/kilo
Review: https://review.openstack.org/173613

Fix proposed to branch: stable/kilo
Review: https://review.openstack.org/174054

Change abandoned by Doug Hellmann (<email address hidden>) on branch: proposed/kilo
Review: https://review.openstack.org/173613
Reason: replaced by https://review.openstack.org/174054 in stable/kilo

Reviewed: https://review.openstack.org/174054
Committed: https://git.openstack.org/cgit/openstack/keystone/commit/?id=f1cd53aa5461e28120c97378ab749571c41a5bc1
Submitter: Jenkins
Branch: stable/kilo

commit f1cd53aa5461e28120c97378ab749571c41a5bc1
Author: lin-hua-cheng <email address hidden>
Date: Wed Apr 8 17:03:23 2015 -0700

    WebSSO should use remote_id_attribute by protocol

    WebSSO always use the remote_id_attribute from the
    [federation] group. Fix the issue, by consuming the
    protocol specific remote_id_attribute if available.

    Change-Id: Icdc693965ec53e5ff8f1901af26c9232a20aef7e
    Closes-Bug: #1441827
    (cherry picked from commit 9b11d13856034e3a2cf6ab1f6ca80a6965818d17)

Fix proposed to branch: master
Review: https://review.openstack.org/179288

Reviewed: https://review.openstack.org/179288
Committed: https://git.openstack.org/cgit/openstack/keystone/commit/?id=9bc6043eb06199b8d4dbf6698e129d984a59cc11
Submitter: Jenkins
Branch: master

commit 65a50eebb8d0a53a2c4c226eb9a564c4d535ac68
Author: Brant Knudson <email address hidden>
Date: Wed Apr 22 11:33:00 2015 -0500

    Sync oslo-incubator Ie51669bd278288b768311ddf56ad31a2f28cc7ab

    This syncs to oslo-incubator to commit 64b5819 and also includes
    51280db.

    Change-Id: I7b43a67a0b67fe0ff5ac3d87708ecc4ab52102f8
    Depends-On: Ie51669bd278288b768311ddf56ad31a2f28cc7ab
    Closes-Bug: #1446583
    (cherry picked from commit 797da5f05444e7cfbf55df52867ade6107834f00)

commit 579a065c0dcce554a5dca86164eb8f1d6fb43c4d
Author: OpenStack Proposal Bot <email address hidden>
Date: Mon Apr 20 17:55:55 2015 +0000

    Updated from global requirements

    Change-Id: I72af7a36f2c3ba206be06fa35323386801e6ff81

commit 906485152a8ec886cf4a45cbe1037184ce39f1a1
Author: Andreas Jaeger <email address hidden>
Date: Mon Apr 20 11:11:25 2015 +0200

    Release Import of Translations from Transifex

    Manual import of Translations from Transifex. This change also removes
    all po files that are less than 66 per cent translated since such
    partially translated files will not help users.

    This change needs to be done manually since the automatic import does
    not handle the proposed branches and we need to sync with latest
    translations.

    Change-Id: Iaf4bdae303b06c1af4023fe2daa3a6b03c195ee9

commit 18ca7fabece4837ad56e435bc9d5f0b6278fa4be
Author: Alexander Makarov <email address hidden>
Date: Mon Apr 6 15:49:41 2015 +0300

    Make memcache client reusable across threads

    memcache.Client is inherited from threading._local so instances are only
    accessible from current thread or eventlet. Present workaround broke
    inheritance chain so super() call is unusable.

    This patch makes artificial client class mimic inheritance from
    threading._local while using generic object methods allowing reusability.

    Change-Id: Ic5d5709695877afb995fd816bb0e4ce711b99b60
    Closes-Bug: #1440493
    (cherry picked from commit 33a95575fc3778bf8ef054f7b9d24fcb7c75100b)

commit cedce339a08d475617c7f57c148e192dc3709a34
Author: Thierry Carrez <email address hidden>
Date: Thu Apr 16 22:19:42 2015 +0200

    Set default branch to stable/kilo

    Open stable/kilo branch by setting defaultbranch for git-review.

    Change-Id: If5b35b0fc5a85ba8dda16dc6b365537ed0d839bc

commit 86df39c01e96ad3b15e33eb6fc1bf726a0a704c5
Author: Eric Brown <email address hidden>
Date: Mon Apr 13 11:37:53 2015 -0700

    backend_argument should be marked secret

    Since the backend_argument can potentially contain a password,
    it should be marked secret to avoid leakage into the logs.

    Closes-Bug: #1443598

    Change-Id: I55663db4cf2df84a66de8f64fba4b4f129ae827d
    (cherry picked from commit f9db1a65bd4d83d12c572ba4d5807845996ef410)

commit b679e7d6be18d33ebdfe133161a3daf2f305d954
Author: Lance Bragstad <email address hidden>
Date: Tue Apr 7 18:47:34 2015 +0000

    Update man p...