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

Change-Id: Iaef6e53fb6cecb57cc16f3ec73763b3ac9633707