Merge "[SDNC] Chart cleanup from TLS/AAF options"