Merge "Update APPC charts for Casablanca AAF support"