Updated configure_os func and used constants for LOCATOR_FILTER_KEY
Merge branch 'master' into fkey-constant

Conflicts:
	robottelo/ui/template.py
fkey: Updated for travis E122 in constants module
Added a NOTE for FILTER dict in constant's module
Merge pull request #323 from kbidarkar/fkey-constant

Updated configure_os func and used constants for LOCATOR_FILTER_KEY