Bug 951368 - V2 support broke reading .uservars

* Added code branch to read .uservars
Merge pull request #2044 from jwhonce/wip/oo_trap_user

Bug 951368 - V2 support broke reading .uservars