MH-6386 -- Added audio normalization support
Merge branch 'develop' into f/MH-6386-audio-normalization
MH-9990 -- Added workflow cleanup strategy
MH-9990 -- More work on cleanup strategy
MH-9990 -- fixed possible NPE
MH-9990 -- Fixed cleanup logging
MH-9990 -- fixed deletion of parentless jobs with child jobs
MH-9990 -- Fixed workflow limitation
MH-9990 -- Avoided deletion of parentless RESUME jobs
MH-10160 -- Implemented CUD Endpoints and related methods in user directory.
Merge branch 'r/1.5.0' into develop

Conflicts:
	modules/matterhorn-admin-ui/pom.xml
	modules/matterhorn-analytics-impl/pom.xml
	modules/matterhorn-analytics-ui/pom.xml
	modules/matterhorn-annotation-api/pom.xml
	modules/matterhorn-annotation-impl/pom.xml
	modules/matterhorn-authorization-manager/pom.xml
	modules/matterhorn-authorization-xacml/pom.xml
	modules/matterhorn-caption-api/pom.xml
	modules/matterhorn-caption-impl/pom.xml
	modules/matterhorn-caption-remote/pom.xml
	modules/matterhorn-capture-admin-service-api/pom.xml
	modules/matterhorn-capture-admin-service-impl/pom.xml
	modules/matterhorn-capture-agent-api/pom.xml
	modules/matterhorn-capture-agent-impl/pom.xml
	modules/matterhorn-common/pom.xml
	modules/matterhorn-composer-ffmpeg/pom.xml
	modules/matterhorn-composer-service-api/pom.xml
	modules/matterhorn-composer-service-remote/pom.xml
	modules/matterhorn-conductor/pom.xml
	modules/matterhorn-confidence-monitoring-ui/pom.xml
	modules/matterhorn-dataloader/pom.xml
	modules/matterhorn-db/pom.xml
	modules/matterhorn-dictionary-api/pom.xml
	modules/matterhorn-dictionary-textcorpora/pom.xml
	modules/matterhorn-distribution-service-acl-remote/pom.xml
	modules/matterhorn-distribution-service-acl/pom.xml
	modules/matterhorn-distribution-service-api/pom.xml
	modules/matterhorn-distribution-service-download-remote/pom.xml
	modules/matterhorn-distribution-service-download/pom.xml
	modules/matterhorn-distribution-service-streaming-remote/pom.xml
	modules/matterhorn-distribution-service-streaming/pom.xml
	modules/matterhorn-dublincore/pom.xml
	modules/matterhorn-engage-ui/pom.xml
	modules/matterhorn-episode-service-api/pom.xml
	modules/matterhorn-episode-service-filesystem/pom.xml
	modules/matterhorn-episode-service-impl/pom.xml
	modules/matterhorn-export-impl/pom.xml
	modules/matterhorn-fileupload/pom.xml
	modules/matterhorn-gstreamer-service-api/pom.xml
	modules/matterhorn-gstreamer-service-impl/pom.xml
	modules/matterhorn-gstreamer-service-remote/pom.xml
	modules/matterhorn-ingest-service-api/pom.xml
	modules/matterhorn-ingest-service-impl/pom.xml
	modules/matterhorn-inspection-service-api/pom.xml
	modules/matterhorn-inspection-service-impl/pom.xml
	modules/matterhorn-inspection-service-remote/pom.xml
	modules/matterhorn-json/pom.xml
	modules/matterhorn-kernel/pom.xml
	modules/matterhorn-load-test/pom.xml
	modules/matterhorn-lti/pom.xml
	modules/matterhorn-manager-api/pom.xml
	modules/matterhorn-manager-impl/pom.xml
	modules/matterhorn-mediapackage-manipulator/pom.xml
	modules/matterhorn-mediapackage-ui/pom.xml
	modules/matterhorn-metadata-api/pom.xml
	modules/matterhorn-metadata/pom.xml
	modules/matterhorn-mpeg7/pom.xml
	modules/matterhorn-oaipmh/pom.xml
	modules/matterhorn-publication-service-api/pom.xml
	modules/matterhorn-publication-service-youtube-remote/pom.xml
	modules/matterhorn-publication-service-youtube/pom.xml
	modules/matterhorn-runtime-dependencies/pom.xml
	modules/matterhorn-runtime-info-ui/pom.xml
	modules/matterhorn-scheduler-api/pom.xml
	modules/matterhorn-scheduler-impl/pom.xml
	modules/matterhorn-scheduler-remote/pom.xml
	modules/matterhorn-search-service-api/pom.xml
	modules/matterhorn-search-service-feeds/pom.xml
	modules/matterhorn-search-service-impl/pom.xml
	modules/matterhorn-search-service-remote/pom.xml
	modules/matterhorn-security-cas/pom.xml
	modules/matterhorn-security-ldap/pom.xml
	modules/matterhorn-security-openid/pom.xml
	modules/matterhorn-security-shibboleth/pom.xml
	modules/matterhorn-series-service-api/pom.xml
	modules/matterhorn-series-service-impl/pom.xml
	modules/matterhorn-series-service-remote/pom.xml
	modules/matterhorn-serviceregistry-remote/pom.xml
	modules/matterhorn-serviceregistry/pom.xml
	modules/matterhorn-solr/pom.xml
	modules/matterhorn-speech-recognition-service-api/pom.xml
	modules/matterhorn-static/pom.xml
	modules/matterhorn-textanalyzer-api/pom.xml
	modules/matterhorn-textanalyzer-impl/pom.xml
	modules/matterhorn-textanalyzer-remote/pom.xml
	modules/matterhorn-textextractor-tesseract/pom.xml
	modules/matterhorn-userdirectory-ldap/pom.xml
	modules/matterhorn-userdirectory/pom.xml
	modules/matterhorn-usertracking-api/pom.xml
	modules/matterhorn-usertracking-impl/pom.xml
	modules/matterhorn-videosegmenter-api/pom.xml
	modules/matterhorn-videosegmenter-impl/pom.xml
	modules/matterhorn-videosegmenter-remote/pom.xml
	modules/matterhorn-webconsole/pom.xml
	modules/matterhorn-workflow-service-api/pom.xml
	modules/matterhorn-workflow-service-impl/pom.xml
	modules/matterhorn-workflow-service-remote/pom.xml
	modules/matterhorn-working-file-repository-service-api/pom.xml
	modules/matterhorn-working-file-repository-service-impl/pom.xml
	modules/matterhorn-working-file-repository-service-remote/pom.xml
	modules/matterhorn-workspace-api/pom.xml
	modules/matterhorn-workspace-impl/pom.xml
	pom.xml
Merge branch 'develop' into f/MH-6386-audio-normalization
Merge branch 'develop' into f/MH-6386-audio-normalization
Merge branch 'opencast/develop' into t/MH-10160-CUD-operations-for-users
MH-10160 -- Made userdirectory user endpoint consistent
MH-9990 -- Fixed remove jobs without parent unit test
MH-9990 -- Fixed workflow cleanup remote implementation
MH-9990 -- Fixed removing temporary files from already deleted workflow job
Merge branch 'develop' into f/MH-6386-audio-normalization
Fixed merge issue