A fix for AMEC-2433
Merge remote-tracking branch 'origin/dev-AMEC-2433' into release/2.9.15rc
updating versions, merging AMEC-2433
Incrementing ambra version in pom.xml