Merge "Use trusts in Heat integration test"