redhat: update merge.py to handle merge.pl corner cases

Change merge.py to handle input config files in similar manner to how merge.pl did it.

Signed-off-by: Clark Williams williams@redhat.com