Merge "rdbms: include client ID hash in ChronologyProtector cookies"