Merge pull request #1194 from joshbodily/josh/fix_scoped_class2

Fix scoped enum not working in gmock-gen.py