Merge "jenkins.py cleanup"