fix merge conflict

.../src/main/java/org/bigbluebutton/api/domain/Breakout.java

.../java/org/bigbluebutton/api/domain/RecordingMetadata.java

...g/bigbluebutton/api/domain/RecordingMetadataPlayback.java

...bigbluebutton/api/util/RecordingMetadataReaderHelper.java

...main/java/org/bigbluebutton/api/util/ResponseBuilder.java

bbb-common-web/src/test/resources/breakout-room-metadata.xml

bbb-common-web/src/test/resources/get-meeting-info.ftlx

bbb-common-web/src/test/resources/get-meetings.ftlx

bbb-common-web/src/test/resources/get-recordings.ftl

bbb-common-web/src/test/resources/get-recordings.ftlx

bbb-common-web/src/test/resources/include-recording.ftlx

...uebutton/api/util/RecordingMetadataReaderHelperTest.scala

...cala/org/bigbluebutton/api/util/ResponseBuilderTest.scala

bigbluebutton-client/.gitignore

bigbluebutton-client/locale/am/bbbResources.properties

bigbluebutton-client/locale/am_ET/bbbResources.properties

bigbluebutton-client/locale/ar/bbbResources.properties

bigbluebutton-client/locale/ar_EG/bbbResources.properties

bigbluebutton-client/locale/ar_SA/bbbResources.properties

bigbluebutton-client/locale/az_AZ/bbbResources.properties