Additional test cases for C++11 strongly-typed enums
Revert "C++11 strongly-typed enums fix for Java only"

This reverts commit cf139a90db852446269b0ce7b7ed5f2bf623eafb.
C++11 strongly-typed enums fix for Java only (proper)