Add 'Unmerged files' state to git_puill function
	- Slightly clean up function for readability
Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONLabTest
Paxtera changes needed for parameterized testcases in the params file
Parameterize the testcases for CHO test
Remove unneeded declaration of global variable
Include references in git log output