Added wrapper to replace use of KeyMaker

Ben Couturierrequested to merge
bcouturi_UseMakeKey into master

Ideas for discussion about how we deal with condition keys (just a basis for discussion)

Edited by Ben Couturier

Merge request reports