Removing hack for separating id from format in keys controller
Merge pull request #1672 from abhgupta/abhgupta-dev

Merged by openshift-bot