jenkins_integration: Adding merge to staging on stage_* steps, minor cleanup