Merge 9.5.z to master after sonar changes

Author: shanty

build.gradle

@@ -21,7 +21,7 @@ buildscript {
 
 group = 'com.synopsys.integration'
 
-version = '9.5.0-SIGQA2-SNAPSHOT'
+version = '9.6.0-SNAPSHOT'
 
 apply plugin: 'com.synopsys.integration.solution'
 apply plugin: 'org.springframework.boot'