Merge latest keystone changes to package

[Sergii Golovatiuk]

Please merge to our package the latest changes from

https://review.openstack.org/#/c/119452/

Also Puppet manifests should be modified to add required settings.

[Dmitry Mescheryakov (dmitrymex)]

We've got the fix from the upstream for 6.0, hence 'fix committed' here

[Mike Scherbakov (mihgen)]

Dmitry, what about 5.1.1 then?

[Alexander Makarov (amakarov)]

Latest changes are in documentation and code styling - logic unchanged.

[Sergii Golovatiuk (sgolovatiuk)]

Since the logic is not changed we don't need to backport anything to 5.1.1 as in upstream there is only docstring and some stylistic changes.

[Andrey Sledzinskiy (asledzinskiy)]

verified on {

    "build_id": "2014-12-26_14-25-46",
    "ostf_sha": "a9afb68710d809570460c29d6c3293219d3624d4",
    "build_number": "58",
    "auth_required": true,
    "api": "1.0",
    "nailgun_sha": "5f91157daa6798ff522ca9f6d34e7e135f150a90",
    "production": "docker",
    "fuelmain_sha": "81d38d6f2903b5a8b4bee79ca45a54b76c1361b8",
    "astute_sha": "16b252d93be6aaa73030b8100cf8c5ca6a970a91",
    "feature_groups": [
        "mirantis"
    ],
    "release": "6.0",
    "release_versions": {
        "2014.2-6.0": {
            "VERSION": {
                "build_id": "2014-12-26_14-25-46",
                "ostf_sha": "a9afb68710d809570460c29d6c3293219d3624d4",
                "build_number": "58",
                "api": "1.0",
                "nailgun_sha": "5f91157daa6798ff522ca9f6d34e7e135f150a90",
                "production": "docker",
                "fuelmain_sha": "81d38d6f2903b5a8b4bee79ca45a54b76c1361b8",
                "astute_sha": "16b252d93be6aaa73030b8100cf8c5ca6a970a91",
                "feature_groups": [
                    "mirantis"
                ],
                "release": "6.0",
                "fuellib_sha": "fde8ba5e11a1acaf819d402c645c731af450aff0"
            }
        }
    },
    "fuellib_sha": "fde8ba5e11a1acaf819d402c645c731af450aff0"

}