Merge "Remove deprecated CONN_TRX_AUTO alias"