Bug 957095 - V2 support in rhcsh broke USER_VARS

* Restore support for USER_VARS in rhcsh
Merge pull request #2267 from jwhonce/bug/957095

Merged by openshift-bot