Merge "Adding unit test for ImsConferenceController"