Merge "ONAP: Improve jenkins rebase and push-upstream jobs"