Fix keystone trust client

 * The issue popped up after release of python-keystoneclient 0.7.
   The issue is caused by new keystoneclient not accepting
   project_id and trust_id simultaneously as constructor parameters.

Change-Id: Id0b7b582e9b794dace0f440df582ff9502b781c5
Merge "Fix keystone trust client"