Fixed test: test_update_os_template
adding setUp method to BaseCLI class
which logs test method name
Merge pull request #321 from sghai/assert-fix

Fixed test: test_update_os_template
Merge pull request #322 from alda519/cli_print_test_name

Log test class and method name
Merge branch 'master' into fkey-constant

Conflicts:
	robottelo/ui/template.py