Merge "Remove odlparent-6.0.x jobs"