Merge pull request #67 from ares/master

Fix #4347 - validations adapted to latest puppet