Merge "AAI-1523 Tweak onap-java-formatter.xml"