Update PuPHPet and various manifests to the latest version.
Merge branch 'puphpet-updates'