Merge "Update ApfIntegrationTest for APFv6/v6.1 requirements" into main