Few fixes and added more tests
Merge branch 'master' into org-test3

Conflicts:
	robottelo/ui/locators.py
Added finer control for Org assoc for entities
Updated remove tests with asserts
org-tests rm: fix for flake8
updated bugid and assert methodology
Added assert for association of entities
Updated comments for assert
Merge pull request #520 from kbidarkar/org-test3

Few fixes and added more tests