JENKINS-21408 Apply 4-space formatting
JENKINS-21408 Use Preconditions for validation