Make safe conditions for enablement of master, slave and client

Change-Id: I74cf2ea66308246d0e8db257270942bffb7f3ab3
3 files changed