[puppet] Non-fast-forward update to branch master