[1336653] Support multiple versions of puppet manifests - fixing a bug in this earlier checkin.