Keystone version response incorrect

Returned version list is not according to documented syntax in admin guide. Admin guide says the response should be a list as follows:
{
"versions": {
"values": [
{
"id": "v1.0",
...

For JSON we are getting:
$ curl http://localhost:35357
{
    "version" : {
        "id" : "v2.0",
        "status" : "beta",
        "updated" : "2011-11-19T00:00:00Z",
        "links": [
            {
                "rel" : "self",
                "href" : "http://127.0.0.1:35357/v2.0/"
            },
            {
                "rel" : "describedby",
                "type" : "text/html",
                "href" : "http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
            },
            {
                "rel" : "describedby",
                "type" : "application/pdf",
                "href" : "http://docs.openstack.org/api/openstack-identity-service/2.0/identity-dev-guide-2.0.pdf"
            },
            {
                "rel" : "describedby",
                "type" : "application/vnd.sun.wadl+xml",
                "href" : "http://127.0.0.1:35357/v2.0/identity-admin.wadl"
            }
        ],
        "media-types": [
            {
                "base" : "application/xml",
                "type" : "application/vnd.openstack.identity-v2.0+xml"
            },
            {
                "base" : "application/json",
                "type" : "application/vnd.openstack.identity-v2.0+json"
            }
        ]
    }
}

For XML we are getting:
$ curl -H "Accept: application/xml" http://localhost:35357
<?xml version="1.0" encoding="UTF-8"?>
<version xmlns="http://docs.openstack.org/common/api/v2.0"
         xmlns:atom="http://www.w3.org/2005/Atom"
         id="v2.0" status="beta" updated="2011-11-19T00:00:00Z">

    <media-types>
        <media-type base="application/xml"
                    type="application/vnd.openstack.identity-v2.0+xml"/>
        <media-type base="application/json"
                    type="application/vnd.openstack.identity-v2.0+json"/>
    </media-types>

     <atom:link rel="self"
                href="http://127.0.0.1:35357/v2.0/"/>

     <atom:link rel="describedby"
                type="text/html"
                href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/" />

     <atom:link rel="describedby"
                type="application/pdf"
                href="http://docs.openstack.org/api/openstack-identity-service/2.0/identity-dev-guide-2.0.pdf" />

     <atom:link rel="describedby"
                type="application/vnd.sun.wadl+xml"
                href="http://127.0.0.1:35357/v2.0/identity-admin.wadl" />
</version>