Merge "fixed sonar issues in AAIClientRESTExecutor.java"