Merge "rdbms: fix a few IDEA warnings in Database"