Merge "rdbms: cleanup visibility of Database::makeSelectOptions()"