Issue #2402635 by acbramley, chx, neclimdul, smustgrave, googletorp, xjm: Remove closure from NodeGrantDatabaseStorage::access and fix return type of alterQuery