Flip logic to detect naming collision during reification. #1229.
Merge branch 'jruby-1_7'