Merge "Support using existing private key when using external heat template file"