Remove JDK 5 syntax from templates.xml.
Ongoing work on CLI params.