jenkins_integration: cleaning up and consolidating scripts
jenkins_integration: fixing small bugs