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
Added some more tests for products
Merge branch 'master' into prd-tests5

Conflicts:
	robottelo/ui/products.py
Added new ddt tests for test_user
updated bugid and assert methodology
gpgkey tests from test_key_associate_[10-20]
redminebug for activation_key create
fixed new ddt tests for test_user
Merge pull request #550 from tkolhar/master

Added new ddt tests for test_user
fix cjk range
Merge pull request #553 from cswiii/cjkfix

fix cjk range
updated exception for else part
Merge pull request #535 from kbidarkar/prd-tests5

Added some more tests for products
replacing '' with None
Merge pull request #551 from sghai/assoc-gpg-tests

gpgkey tests from test_key_associate_[10-20]
Merge pull request #552 from AdamSaleh/api-ackt-key-bug

redminebug for activation_key create