Merge "externalstore: use CONN_TRX_AUTOCOMMIT instead of IDatabase::clearFlag()"