Fixes #6327 - cv resolv env name opt BZ1111231

Fixes issue where content-view --lifecycle-environment option
resolves for the puppet environment instead of the
lifecycle-environment.
Merge pull request #195 from dustint-rh/cv_environment_options

Fixes #6327 - cv resolv env name opt BZ1111231
wip