Changed heat to use Keystone trusts by default