Merge "Replace legacy cred provider in heat api test"