Merge "Update heat config files permissions"