Fix #4367 - current environment compatible with all puppet versions

Validator is covered by tests now.