reflect new restraint xml file names

Signed-off-by: Gowrishankar Rajaiyan <gsr@redhat.com>
refactor to use return instead of global var

Signed-off-by: Gowrishankar Rajaiyan <gsr@redhat.com>
Merge branch 'master' of ssh://github.com/mrniranjan/ci-utilities
Fix a minor issue in rhcs_ci.py