Fixed Org locators issue identified in automation job and removed an unused import in test_operatingsys.py
Merge pull request #270 from sthirugn/master

Fixed Org locators issue identified in automation job and removed an unu...
Merge branch 'master' into common-func

Conflicts:
	tests/ui/test_operatingsys.py