Resolve issue with KeyPair assignment

Environment with a service with Key Pair assigned
could not be deployed due to invalid match in workflows
causing invalid Heat template to be produced by Conductor.

Change-Id: Id3ad4581cd9ce40a569ac580d0aee8db017855c7
Closes-bug: #1274011