More fixes for replacer plugin; also, upgrade default JDK to 1.6