Merge "Fix sonar issue in AAIClientRESTExecutor"