Merge "Remove KeyName parameter from overcloud template"