Merge "Added a few more trx sanity checks to DatabaseBase"