Merge remote-tracking branch 'remotes/origin/morphemic-rc2.0' into branchSynchronization

# Conflicts:
#	connectors/proactive_client/pom.xml
3 jobs for branchSynchronization in 4 minutes and 15 seconds (queued for 12 seconds)