Org tests UI: converted org tests to factory
Merge branch 'master' into convert-orgtests-factory

Conflicts:
	tests/foreman/ui/test_org.py
test_org UI: fix the factory imports
Merge pull request #1110 from kbidarkar/convert-orgtests-factory

Org tests UI: converted org tests to factory