Merge "keystone trusts API test, move delete into tearDown handler"