Merge "Heat: use pkey from string instead of key_filename"