[FIXED JENKINS-17964]

avoids NPE caused by the removal of the upstream build, fixes inconsistent tab-space formatting