Merge "BUG-1388: fixed ClassTemplate to avoid unused import of BigInteger."