Fix DISCL-242 - Concurrency issues in MasterToWallChannel

Change-Id: I4ebee170ec06bed730e9287e42bed81a3fa8b8b1