Merge "fix aai travers/resources logback boostrap"