Bump puppet-puppet for 1.2.1
Release 1.2.1
Merge branch '1.2-stable' into 'master'