Merge "Override TransactionFactor method in DataBroker to return correct TransactionC...