merging jmtd fixes + a few more fixes that came up with the latest updates to Puppet.