Merge pull request #33 from walmartlabs-wmusiphone/issue/CB-2454-minimal-fixes

Issue/cb 2454 minimal fixes
Merge branch 'kazoo_dev' into newSearchFix

* kazoo_dev: