Update puppet-{heat,neutron} references

Close #665 
Close #660