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

Change-Id: I91885bf06f7102187e0ed72b85143c2368f75548