CLC-2661 Reopened: Use correct hash key type
Merge pull request #1798 from ctweney/clc-2661-reop-qa

CLC-2661 (QA) Reopened: Use correct hash key type