jenkins_integration: cleaning up various bits in setting up new flow