allow for user or user_id as the key passed in txn_do to indicate which
user is to be attributed to a changeset
Merge branch 'release/0.5.3'