Remove tenant_id from neutron subnet URI

The URI should not contain tenant_id such as net and port. Also
fix wrong format of version.

Change-Id: I2991770802fc22e02e01e27a94033286ef1f5038
Closes-Bug: #1270905
Fix add role api - bad json keyword

The json body of the add role api, included a typo mistake. The
keyword `roles` should have been `role`. Hence the patch.

$ curl -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" http://localhost:5000/v3/roles -d '{"roles": {"name": "NewRole"}}' | jq .
{
  "error": {
    "title": "Bad Request",
    "code": 400,
    "message": "create_role() got an unexpected keyword argument 'roles'"
  }
}
$ curl -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" http://localhost:5000/v3/roles -d '{"role": {"name": "NewRole"}}' | jq .
{
  "role": {
    "name": "NewRole",
    "links": {
      "self": "http://85.233.197.43:5000/v3/roles/a9420a5dedd54197b69e37b4b8fdd737"
    },
    "id": "a9420a5dedd54197b69e37b4b8fdd737"
  }
}

Change-Id: I825d0925114d79d26ae7c43727fc9c9f49171442
Merge "Remove tenant_id from neutron subnet URI"