Merge pull request #1358 from abhgupta/abhgupta-dev

Merged by openshift-bot
making usage filter a generic hash