Merge "rdbms: make implement IResultWrapper directly instead of via inheritence"