Merge "Make sysstat script more readable"

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
Simple merge

diff --cc .jjb-test/expected-xml/gerrit-ciman-packer-verify
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
Simple merge

diff --cc .jjb-test/expected-xml/github-ciman-packer-verify
Simple merge