hg: jigsaw/m2/jdk: Fix merge mistakes

[erik . joelsson]

Changeset: 6e4034b2fc80
Author:    erikj
Date:      2014-12-03 14:52 +0100
URL:       http://hg.openjdk.java.net/jigsaw/m2/jdk/rev/6e4034b2fc80

Fix merge mistakes

! make/copy/Copy-jdk.crypto.ucrypto.gmk
! make/gensrc/GensrcCharsetMapping.gmk