Bug 957095 - V2 support in rhcsh broke USER_VARS

* Restore support for USER_VARS in rhcsh