Community contribution fixing underscore definitions.

Fixes issue 1021
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=47827310