small refactor
Fixed issue with rollbacks failing due to o_user_id constraint
Merge branch 'master' of gitlab.pnmac.com:mcfly