[FIXED JENKINS-17964] avoids NPE caused by the removal of the upstream build, fixed inconsistent tab-space formatting