Ensure all cms commands accept either deprecated or new syntax for keys
LMS-2712