Merged refs/pull/5589/head from repository cms-sw
Merged refs/pull/5593/head from repository cms-sw
Fix dictionary checking errors
Merge pull request #5594 from wmtan/FixDictionaryCheckingErrors

Fix dictionary checking errors