Merge "Add unit test for CEP at conference creation." into rvc-dev am: 70c9dcd267 am: 089134435d am: d08b4ce657

Change-Id: Ibc448df84d10ff7897d54317de84f03862cf6a83