Merge "sonar fix AAFcli.java"