Fix #4347 - validations adapted to latest puppet