Refactor merge.py and add tests for it#165

naved001 merged 6 commits intoCCI-MOC:mainCCI-MOC/openshift-usage-scripts:mainfrom

naved001:refactor-merge-pynaved001/openshift-usage-scripts:refactor-merge-pyCopy head branch name to clipboard