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

Change-Id: I4fe4ab42a604e7a2ff0fd62d8c4a88f09e8f8872