minor refactoring in SlaveTemplate validation