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