CORD-3112 Fix key problems in synchronizers

Change-Id: Ie117040e9c84009167009d391de7cacbd5ed490b
22 files changed