[OS-BUILD PATCHv3 0/4] redhat: update merge.py to handle merge.pl corner cases