Merge "Fixing broken Heat tests for Swift resources"