Merge branch 'release/2.4'

# Conflicts:
#	rcpttTests/pom-base.xml