Changed heat to use Keystone trusts by default
Merge remote-tracking branch 'upstream/master'