Merge "Fix early processing of merge-pending items on reconfig" into feature/zuulv3